blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T98344: Crash opening file with proxy. 

Weird file where the proxy object has a `proxy_group` pointer, which
does not instantiate any collection...
This commit is contained in:
Bastien Montagne 2022-05-25 11:22:17 +02:00
parent a4e7a5aa4f
commit cb3b9358bf
Notes: blender-bot 2023-02-14 03:29:37 +01:00 
Referenced by issue #98344, Crash opening file with proxy
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/lib_override_proxy_conversion.c
View File

@ -39,7 +39,8 @@ bool BKE_lib_override_library_proxy_convert(Main *bmain,
/* `proxy_group`, if defined, is the empty instantiating the collection from which the proxy is
* coming. */
Object *ob_proxy_group = ob_proxy->proxy_group;
const bool is_override_instancing_object = ob_proxy_group != NULL;
const bool is_override_instancing_object = (ob_proxy_group != NULL) &&
(ob_proxy_group->instance_collection != NULL);
ID *id_root = is_override_instancing_object ? &ob_proxy_group->instance_collection->id :
&ob_proxy->proxy->id;
ID *id_instance_hint = is_override_instancing_object ? &ob_proxy_group->id : &ob_proxy->id;