[Bf-blender-cvs] [7e97dd7] soc-2016-cycles_images: Ad basic theme settings for new stats editor.
Thomas Dinges
noreply at git.blender.org
Fri Aug 19 23:28:25 CEST 2016
Commit: 7e97dd76f8d11a8f975e7962538663c81204a0c3
Author: Thomas Dinges
Date: Fri Aug 19 23:28:08 2016 +0200
Branches: soc-2016-cycles_images
https://developer.blender.org/rB7e97dd76f8d11a8f975e7962538663c81204a0c3
Ad basic theme settings for new stats editor.
===================================================================
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/editors/interface/resources.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 483fefb..2247d32 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -28,7 +28,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 277
-#define BLENDER_SUBVERSION 3
+#define BLENDER_SUBVERSION 4
/* Several breakages with 270, e.g. constraint deg vs rad */
#define BLENDER_MINVERSION 270
#define BLENDER_MINSUBVERSION 6
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 943e635..21e3646 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -1201,6 +1201,11 @@ void ui_theme_init_default(void)
rgba_char_args_set(btheme->tclip.strip_select, 0xff, 0x8c, 0x00, 0xff);
btheme->tclip.handle_vertex_size = 5;
ui_theme_space_init_handles_color(&btheme->tclip);
+
+ /* space stats */
+ btheme->tstats = btheme->tv3d;
+
+ rgba_char_args_set_fl(btheme->tstats.back, 0.42, 0.42, 0.42, 1.0);
}
void ui_style_init_default(void)
@@ -2737,6 +2742,13 @@ void init_userdef_do_versions(void)
}
}
+ if (!USER_VERSION_ATLEAST(277, 4)) {
+ for (bTheme *btheme = U.themes.first; btheme; btheme = btheme->next) {
+ btheme->tstats = btheme->tv3d;
+ rgba_char_args_set_fl(btheme->tstats.back, 0.42, 0.42, 0.42, 1.0);
+ }
+ }
+
/**
* Include next version bump.
*
More information about the Bf-blender-cvs
mailing list