diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-05-25 12:23:53 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-05-25 12:23:53 +0300 |
| commit | 4949dd54eb4576442050690f44b2c6ec7366e011 (patch) | |
| tree | 196b215de180a155e341c495bea168639c6e119a /source | |
| parent | 6ec0f62e3f9ef197d4843203c622a675fb08e72c (diff) | |
| parent | cb3b9358bfb482c1968bdd6d3e5d84101c4ecb77 (diff) | |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/lib_override_proxy_conversion.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/lib_override_proxy_conversion.c b/source/blender/blenkernel/intern/lib_override_proxy_conversion.c index 3d4ccf5f426..88f6fbb0ead 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; |