[Bf-blender-cvs] [626624ca791] temp-sculpt-colors: Fix incomplete implementation of fallback code for active/render color attributes when the relevent active flags do not exist.

[Joseph Eagar]

Commit: 626624ca7917faec7a9a9f29cd31905203cfed0b
Author: Joseph Eagar
Date:   Tue Feb 15 09:47:24 2022 -0800
Branches: temp-sculpt-colors
https://developer.blender.org/rB626624ca7917faec7a9a9f29cd31905203cfed0b

Fix incomplete implementation of
fallback code for active/render color
attributes when the relevent
active flags do not exist.

Also bumped the subversion number.

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

M	source/blender/blenkernel/BKE_blender_version.h
M	source/blender/blenkernel/intern/attribute.c
M	source/blender/blenloader/intern/versioning_300.c

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

diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 21bbb4ce9ad..d09b0a02ad8 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -25,7 +25,7 @@ extern "C" {
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 3
+#define BLENDER_FILE_SUBVERSION 4
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and show a warning if the file
diff --git a/source/blender/blenkernel/intern/attribute.c b/source/blender/blenkernel/intern/attribute.c
index 0bbb4d6d1b2..3dfd43c6b17 100644
--- a/source/blender/blenkernel/intern/attribute.c
+++ b/source/blender/blenkernel/intern/attribute.c
@@ -548,6 +548,8 @@ CustomDataLayer *BKE_id_attribute_subset_active_get(ID *id,
       if (layer->flag & active_flag) {
         return layer;
       }
+
+      candidate = layer;
     }
   }
 
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index c88288aabc6..920f9234cf2 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -2555,7 +2555,7 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
   }
 
   /* rebuild active/render color attribute references*/
-  if (!MAIN_VERSION_ATLEAST(bmain, 302, 3)) {
+  if (!MAIN_VERSION_ATLEAST(bmain, 302, 4)) {
     LISTBASE_FOREACH (Brush *, br, &bmain->brushes) {
       /* buggy code in wm_toolsystem broke smear in old files,
          reset to defaults */