[Bf-blender-cvs] [c53a3ed] wiggly-widgets: Fix initialization of tweaked theme colors after last merge
Julian Eisel
noreply at git.blender.org
Sat Sep 19 22:52:13 CEST 2015
Commit: c53a3edb7c2d1af81ff3302988d8b7986fea1388
Author: Julian Eisel
Date: Sat Sep 19 22:50:56 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBc53a3edb7c2d1af81ff3302988d8b7986fea1388
Fix initialization of tweaked theme colors after last merge
===================================================================
M source/blender/blenkernel/BKE_blender.h
M source/blender/editors/interface/resources.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index e096c9a..327ae89 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -42,7 +42,7 @@ extern "C" {
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 276
-#define BLENDER_SUBVERSION 0
+#define BLENDER_SUBVERSION 1
/* Several breakages with 270, e.g. constraint deg vs rad */
#define BLENDER_MINVERSION 270
#define BLENDER_MINSUBVERSION 5
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index d8cf550..dbbbc13 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2627,7 +2627,7 @@ void init_userdef_do_versions(void)
U.node_margin = 80;
}
- if (!USER_VERSION_ATLEAST(275, 5)) {
+ if (!USER_VERSION_ATLEAST(276, 1)) {
bTheme *btheme;
for (btheme = U.themes.first; btheme; btheme = btheme->next) {
rgba_char_args_set_fl(btheme->tui.xaxis, 1.0f, 0.27f, 0.27f, 1.0f); /* red */
More information about the Bf-blender-cvs
mailing list