[Bf-blender-cvs] [06a492cfdc7] master: Fix (studio reported) crash in new resync code.

Bastien Montagne noreply at git.blender.org
Mon Feb 14 13:27:53 CET 2022


Commit: 06a492cfdc78049adff6923636faa5d13b90cc57
Author: Bastien Montagne
Date:   Mon Feb 14 13:26:42 2022 +0100
Branches: master
https://developer.blender.org/rB06a492cfdc78049adff6923636faa5d13b90cc57

Fix (studio reported) crash in new resync code.

We do not always resync/replace the root ID of a hierarchy now that we
do partial resync.

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

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

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

diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index f53780d1cbb..02cdd6fcd20 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -1696,10 +1696,12 @@ static bool lib_override_library_resync(Main *bmain,
 
   BKE_id_multi_tagged_delete(bmain);
 
-  /* At this point, `id_root` has very likely been deleted, we need to update it to its new
-   * version.
+  /* At this point, `id_root` may have been resynced, therefore deleted. In that case we need to
+   * update it to its new version.
    */
-  id_root = id_root_reference->newid;
+  if (id_root_reference->newid != NULL) {
+    id_root = id_root_reference->newid;
+  }
 
   if (user_edited_overrides_deletion_count > 0) {
     BKE_reportf(reports != NULL ? reports->reports : NULL,



More information about the Bf-blender-cvs mailing list