[Bf-blender-cvs] [eb20ebe] pie-menus: Change blender subversion correctly for pie menus. Also no need for conditionals here.

[Antony Riakiotakis]

Commit: eb20ebe5c2c744f032ac459490f2437012d19d4d
Author: Antony Riakiotakis
Date:   Thu Jul 31 11:05:34 2014 +0200
Branches: pie-menus
https://developer.blender.org/rBeb20ebe5c2c744f032ac459490f2437012d19d4d

Change blender subversion correctly for pie menus. Also no need for
conditionals here.

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

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 50639ba..ea90498 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         271
-#define BLENDER_SUBVERSION      3
+#define BLENDER_SUBVERSION      4
 /* 262 was the last editmesh release but it has compatibility code for bmesh data */
 #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 c24ecdb..dcc06e7 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2454,7 +2454,7 @@ void init_userdef_do_versions(void)
 		}
 	}
 
-	if (U.versionfile < 272 || (U.versionfile == 272 && U.subversionfile < 1)) {
+	if (U.versionfile < 271 || (U.versionfile == 271 && U.subversionfile < 4)) {
 		bTheme *btheme;
 
 		struct uiWidgetColors wcol_pie_menu = {
@@ -2470,17 +2470,10 @@ void init_userdef_do_versions(void)
 			10, -10
 		};
 
-		if (U.pie_menu_radius == 0)
-			U.pie_menu_radius = 150;
-
-		if (U.pie_menu_threshold == 0)
-			U.pie_menu_threshold = 12;
-
-		if (U.pie_operator_timeout == 0)
-			U.pie_operator_timeout = 20;
-
-		if (U.pie_animation_timeout == 0)
-			U.pie_animation_timeout = 6;
+		U.pie_menu_radius = 150;
+		U.pie_menu_threshold = 12;
+		U.pie_operator_timeout = 20;
+		U.pie_animation_timeout = 6;
 
 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
 			btheme->tui.wcol_pie_menu = wcol_pie_menu;