[Bf-blender-cvs] [e3d575b3765] blender-v2.83-release: Fix T75730: Crash on read of liboverride data when missing source modifier.

Bastien Montagne noreply at git.blender.org
Thu Apr 16 16:21:16 CEST 2020


Commit: e3d575b37651b20b281f431047d97b43c0ce028d
Author: Bastien Montagne
Date:   Wed Apr 15 17:23:56 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rBe3d575b37651b20b281f431047d97b43c0ce028d

Fix T75730: Crash on read of liboverride data when missing source modifier.

While this should not happen, we still want to handle those errors
gracefully from user perspective (i.e. assert for devs, no crash for
users).

Actual fix of root cause of the issue will come later.

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

M	source/blender/makesrna/intern/rna_object.c

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

diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index cb8dffe3168..b81a175a94b 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1625,7 +1625,10 @@ bool rna_Object_modifiers_override_apply(Main *bmain,
   }
   mod_src = mod_src ? mod_src->next : ob_src->modifiers.first;
 
-  BLI_assert(mod_src != NULL);
+  if (mod_src == NULL) {
+    BLI_assert(mod_src != NULL);
+    return false;
+  }
 
   /* While it would be nicer to use lower-level modifier_new() here, this one is lacking
    * special-cases handling (particles and other physics modifiers mostly), so using the ED version



More information about the Bf-blender-cvs mailing list