[Bf-blender-cvs] [b7c13da] master: Move theme updates for new handles colors & co into last versioned block.

Bastien Montagne noreply at git.blender.org
Mon Aug 25 12:56:58 CEST 2014


Commit: b7c13da8cc3ac4eadcb914b6584f14fd7568ea25
Author: Bastien Montagne
Date:   Mon Aug 25 12:47:11 2014 +0200
Branches: master
https://developer.blender.org/rBb7c13da8cc3ac4eadcb914b6584f14fd7568ea25

Move theme updates for new handles colors & co into last versioned block.

Also, tweaked versionning for lnors color - we can add immediately versionning code,
using future next subversion, even without actually switching to this subversion now.

Avoids 'empty' versionning blocks floating around, and often forgotten when actually
raising version numbers!

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

M	source/blender/editors/interface/resources.c

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

diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index c2b234d..0879f33 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2447,16 +2447,6 @@ void init_userdef_do_versions(void)
 		}
 	}
 
-	{
-		bTheme *btheme;
-		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
-			ui_theme_space_init_handles_color(&btheme->tclip);
-			ui_theme_space_init_handles_color(&btheme->tima);
-			btheme->tima.handle_vertex_size = 5;
-			btheme->tclip.handle_vertex_size = 5;
-		}
-	}
-
 	if (U.versionfile < 271 || (U.versionfile == 271 && U.subversionfile < 5)) {
 		bTheme *btheme;
 
@@ -2479,10 +2469,15 @@ void init_userdef_do_versions(void)
 
 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
 			btheme->tui.wcol_pie_menu = wcol_pie_menu;
+
+			ui_theme_space_init_handles_color(&btheme->tclip);
+			ui_theme_space_init_handles_color(&btheme->tima);
+			btheme->tima.handle_vertex_size = 5;
+			btheme->tclip.handle_vertex_size = 5;
 		}
 	}
 
-	{
+	if (U.versionfile < 271 || (U.versionfile == 271 && U.subversionfile < 6)) {
 		bTheme *btheme;
 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
 			/* check for (alpha == 0) is safe, then color was never set */




More information about the Bf-blender-cvs mailing list