[Bf-blender-cvs] [9641767affd] blender-v3.2-release: Fix T98847: missing null check in versioning code

Jacques Lucke noreply at git.blender.org
Wed Jun 22 13:03:01 CEST 2022


Commit: 9641767affd9cbccdab6e69d1a9a48299b841d20
Author: Jacques Lucke
Date:   Thu Jun 16 16:23:26 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB9641767affd9cbccdab6e69d1a9a48299b841d20

Fix T98847: missing null check in versioning code

It's perfectly legal for `nmd->settings.properties` to be null if
there are no properties.

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

M	source/blender/blenloader/intern/versioning_300.c

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

diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index e6a214452fe..d2112e27836 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -1000,6 +1000,9 @@ static void do_version_subsurface_methods(bNode *node)
 
 static void version_geometry_nodes_add_attribute_input_settings(NodesModifierData *nmd)
 {
+  if (nmd->settings.properties == NULL) {
+    return;
+  }
   /* Before versioning the properties, make sure it hasn't been done already. */
   LISTBASE_FOREACH (const IDProperty *, property, &nmd->settings.properties->data.group) {
     if (strstr(property->name, "_use_attribute") || strstr(property->name, "_attribute_name")) {



More information about the Bf-blender-cvs mailing list