[Bf-blender-cvs] [8d97ecde02b] blender-v3.3-release: Fix T101559: Rain Test Animation demo crashes Blender 3.3

Bastien Montagne noreply at git.blender.org
Tue Oct 4 11:06:44 CEST 2022


Commit: 8d97ecde02b4fff5c83fc6802372d14f8cf28a53
Author: Bastien Montagne
Date:   Tue Oct 4 11:05:38 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB8d97ecde02b4fff5c83fc6802372d14f8cf28a53

Fix T101559: Rain Test Animation demo crashes Blender 3.3

Update to liboverride creation code to add support of keeping active
object forgot to consider case when there is no known/given view layer.

NOTE: similar fix to rBc3003b4346fd5c5 in master.

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

M	source/blender/blenkernel/intern/lib_override.cc

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

diff --git a/source/blender/blenkernel/intern/lib_override.cc b/source/blender/blenkernel/intern/lib_override.cc
index 29f8b26c296..5a2601eac0f 100644
--- a/source/blender/blenkernel/intern/lib_override.cc
+++ b/source/blender/blenkernel/intern/lib_override.cc
@@ -1215,6 +1215,9 @@ static void lib_override_library_create_post_process(Main *bmain,
                                                      const Object *old_active_object,
                                                      const bool is_resync)
 {
+  /* If there is an old active object, there should also always be a given view layer. */
+  BLI_assert(old_active_object == nullptr || view_layer != nullptr);
+
   /* NOTE: We only care about local IDs here, if a linked object is not instantiated in any way we
    * do not do anything about it. */
 
@@ -1383,7 +1386,7 @@ bool BKE_lib_override_library_create(Main *bmain,
     id_hierarchy_root_reference = id_root_reference;
   }
 
-  const Object *old_active_object = OBACT(view_layer);
+  const Object *old_active_object = (view_layer != nullptr) ? OBACT(view_layer) : nullptr;
 
   const bool success = lib_override_library_create_do(bmain,
                                                       scene,



More information about the Bf-blender-cvs mailing list