[Bf-blender-cvs] [cb3b9358bfb] blender-v3.2-release: Fix T98344: Crash opening file with proxy.

[Bastien Montagne]

Commit: cb3b9358bfb482c1968bdd6d3e5d84101c4ecb77
Author: Bastien Montagne
Date:   Wed May 25 11:22:17 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rBcb3b9358bfb482c1968bdd6d3e5d84101c4ecb77

Fix T98344: Crash opening file with proxy.

Weird file where the proxy object has a `proxy_group` pointer, which
does not instantiate any collection...

===================================================================

M	source/blender/blenkernel/intern/lib_override_proxy_conversion.c

===================================================================

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;