[Bf-blender-cvs] [9690b7c91b9] master: Fix (unreported): missed running versioning code in some files

Jacques Lucke noreply at git.blender.org
Fri Dec 17 13:50:45 CET 2021


Commit: 9690b7c91b992c1c3d909a471c95022659039278
Author: Jacques Lucke
Date:   Fri Dec 17 13:49:53 2021 +0100
Branches: master
https://developer.blender.org/rB9690b7c91b992c1c3d909a471c95022659039278

Fix (unreported): missed running versioning code in some files

The versioning code was accidentally put not at the very bottom.
That lead to a situation where it wasn't run on some files that happened
to be within a specific short time frame.

Since the versioning code is idempotent, it can just run again on existing
files. Therefore, this commit just moves it back to the bottom so that it
is executed on all files again.

Broken Commit: rB5b61737a8f41688699fd1d711a25b7cea86d1530.

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

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 bc3cd7a09cb..7a7f12a7e58 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -2432,22 +2432,6 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
         }
       }
     }
-
-    /* Add node storage for map range node. */
-    FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
-      LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
-        if (node->type == SH_NODE_MAP_RANGE) {
-          if (node->storage == NULL) {
-            NodeMapRange *data = MEM_callocN(sizeof(NodeMapRange), __func__);
-            data->clamp = node->custom1;
-            data->data_type = CD_PROP_FLOAT;
-            data->interpolation_type = node->custom2;
-            node->storage = data;
-          }
-        }
-      }
-    }
-    FOREACH_NODETREE_END;
   }
 
   if (!MAIN_VERSION_ATLEAST(bmain, 301, 5)) {
@@ -2475,5 +2459,21 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
    */
   {
     /* Keep this block, even when empty. */
+
+    /* Add node storage for map range node. */
+    FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
+      LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
+        if (node->type == SH_NODE_MAP_RANGE) {
+          if (node->storage == NULL) {
+            NodeMapRange *data = MEM_callocN(sizeof(NodeMapRange), __func__);
+            data->clamp = node->custom1;
+            data->data_type = CD_PROP_FLOAT;
+            data->interpolation_type = node->custom2;
+            node->storage = data;
+          }
+        }
+      }
+    }
+    FOREACH_NODETREE_END;
   }
 }



More information about the Bf-blender-cvs mailing list