[Bf-blender-cvs] [2b4afcbb4cd] master: Fix T91236: AssetBrowser crash with certain collections

[Philipp Oeser]

Commit: 2b4afcbb4cdc231aebe343cd444d001b9f191204
Author: Philipp Oeser
Date:   Tue Sep 7 13:03:06 2021 +0200
Branches: master
https://developer.blender.org/rB2b4afcbb4cdc231aebe343cd444d001b9f191204

Fix T91236: AssetBrowser crash with certain collections

Caused by {rB5a9a16334c57}

Linking/appending an asset made from a collection containing certain
types of objects lacking bounding boxes (camera, light) would crash.

Add simple bbox check to prevent the crash.

Maniphest Tasks: T91236

Differential Revision: https://developer.blender.org/D12415

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

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

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 4fa211604bc..394245b3a2c 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -5749,6 +5749,8 @@ void BKE_object_replace_data_on_shallow_copy(Object *ob, ID *new_data)
   ob->data = new_data;
   ob->runtime.geometry_set_eval = NULL;
   ob->runtime.data_eval = NULL;
-  ob->runtime.bb->flag |= BOUNDBOX_DIRTY;
+  if (ob->runtime.bb != NULL) {
+    ob->runtime.bb->flag |= BOUNDBOX_DIRTY;
+  }
   ob->id.py_instance = NULL;
 }