From cb3b9358bfb482c1968bdd6d3e5d84101c4ecb77 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 25 May 2022 11:22:17 +0200 Subject: Fix T98344: Crash opening file with proxy. Weird file where the proxy object has a `proxy_group` pointer, which does not instantiate any collection... --- source/blender/blenkernel/intern/lib_override_proxy_conversion.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/lib_override_proxy_conversion.c b/source/blender/blenkernel/intern/lib_override_proxy_conversion.c index 5e9d8e8c4d0..7fa9ba5dca9 100644 --- a/source/blender/blenkernel/intern/lib_override_proxy_conversion.c +++ b/source/blender/blenkernel/intern/lib_override_proxy_conversion.c @@ -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; -- cgit v1.2.3