Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Vazquez <pablo@blender.org>2020-12-09 23:09:23 +0300
committerPablo Vazquez <pablo@blender.org>2020-12-09 23:09:37 +0300
commitac7694aee05047750f955ee2fb0d62942392f6c0 (patch)
tree66b2d42cc41368c3f756949b85f25493db3dd07a
parent41bca5a3eed81d79a62899fcb04fa76674f09c88 (diff)
UI: Update theme to match Shader nodes category color with socket color
The change to match socket color and category was already done, but it was missing versioning code to update the theme on load. Fixes T83500 (already closed as invalid, but this would solve the non-matching colors) Reviewed by Hans Goudey (HooglyBoogly)
-rw-r--r--source/blender/blenkernel/BKE_blender_version.h2
-rw-r--r--source/blender/blenloader/intern/versioning_userdef.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 2ec9e0048a6..afb6112b954 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 5
+#define BLENDER_FILE_SUBVERSION 6
/* 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_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 1d85109774c..7bc11317bb4 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -255,6 +255,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_node.nodeclass_attribute);
}
+ if (!USER_VERSION_ATLEAST(292, 6)) {
+ FROM_DEFAULT_V4_UCHAR(space_node.nodeclass_shader);
+ }
+
/**
* Versioning code until next subversion bump goes here.
*