[Bf-blender-cvs] [8cbec0beb2f] master: Fix/bypass doversion for wire new colors

[Dalai Felinto]

Commit: 8cbec0beb2f31447dc20784f66334c997bbc3b0f
Author: Dalai Felinto
Date:   Wed Sep 29 09:35:05 2021 +0200
Branches: master
https://developer.blender.org/rB8cbec0beb2f31447dc20784f66334c997bbc3b0f

Fix/bypass doversion for wire new colors

Some cases were not covered by the original doversion in
4a0ddeb62bb. For now we make it always change the wire color regardless
of whether it was changed before or not.

This do a subversion bump.

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

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

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

diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 65f9da3b852..fc98abf619d 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -39,7 +39,7 @@ extern "C" {
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 29
+#define BLENDER_FILE_SUBVERSION 30
 
 /* 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/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index ea368c0b3b1..71c7e7cac6a 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -606,6 +606,10 @@ void do_versions_after_linking_300(Main *bmain, ReportList *UNUSED(reports))
     }
   }
 
+  if (!MAIN_VERSION_ATLEAST(bmain, 300, 30)) {
+    do_versions_idproperty_ui_data(bmain);
+  }
+
   /**
    * Versioning code until next subversion bump goes here.
    *
@@ -618,7 +622,6 @@ void do_versions_after_linking_300(Main *bmain, ReportList *UNUSED(reports))
    */
   {
     /* Keep this block, even when empty. */
-    do_versions_idproperty_ui_data(bmain);
   }
 }
 
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 64ecfbe78de..54a0f1beec1 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -291,14 +291,8 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
     btheme->space_sequencer.grid[3] = 255;
   }
 
-  if (!USER_VERSION_ATLEAST(300, 27)) {
-    /* If users have not changed the color of the wires inner color or main color,
-     * set it to the new default. */
-    if ((btheme->space_node.wire[0] == 35) && (btheme->space_node.wire[1] == 35) &&
-        (btheme->space_node.wire[2] == 35) && (btheme->space_node.syntaxr[0] == 128) &&
-        (btheme->space_node.syntaxr[1] == 128) && (btheme->space_node.syntaxr[2] == 128)) {
-      FROM_DEFAULT_V4_UCHAR(space_node.wire);
-    }
+  if (!USER_VERSION_ATLEAST(300, 30)) {
+    FROM_DEFAULT_V4_UCHAR(space_node.wire);
   }
 
   /**