[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57932] trunk/blender/source/blender/ editors/interface/resources.c: Fix #35958: texture timeout with value 0 not preserved when saving user preferences.

[Brecht Van Lommel]

Revision: 57932
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57932
Author:   blendix
Date:     2013-07-02 16:02:56 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Fix #35958: texture timeout with value 0 not preserved when saving user preferences.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/resources.c

Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c	2013-07-02 15:56:32 UTC (rev 57931)
+++ trunk/blender/source/blender/editors/interface/resources.c	2013-07-02 16:02:56 UTC (rev 57932)
@@ -2048,8 +2048,8 @@
 		}
 	}
 
-	/* Freestyle color settings */
-	{
+	if (U.versionfile < 267) {
+		/* Freestyle color settings */
 		bTheme *btheme;
 
 		for (btheme = U.themes.first; btheme; btheme = btheme->next) {
@@ -2063,50 +2063,50 @@
 				rgba_char_args_set(btheme->tv3d.wire_edit,  0x0, 0x0, 0x0, 255);
 			}
 		}
-	}
 
-	/* GL Texture Garbage Collection (variable abused above!) */
-	if (U.textimeout == 0) {
-		U.texcollectrate = 60;
-		U.textimeout = 120;
-	}
-	if (U.memcachelimit <= 0) {
-		U.memcachelimit = 32;
-	}
-	if (U.frameserverport == 0) {
-		U.frameserverport = 8080;
-	}
-	if (U.dbl_click_time == 0) {
-		U.dbl_click_time = 350;
-	}
-	if (U.scrcastfps == 0) {
-		U.scrcastfps = 10;
-		U.scrcastwait = 50;
-	}
-	if (U.v2d_min_gridsize == 0) {
-		U.v2d_min_gridsize = 35;
-	}
-	if (U.dragthreshold == 0)
-		U.dragthreshold = 5;
-	if (U.widget_unit == 0)
-		U.widget_unit = 20;
-	if (U.anisotropic_filter <= 0)
-		U.anisotropic_filter = 1;
+		/* GL Texture Garbage Collection */
+		if (U.textimeout == 0) {
+			U.texcollectrate = 60;
+			U.textimeout = 120;
+		}
+		if (U.memcachelimit <= 0) {
+			U.memcachelimit = 32;
+		}
+		if (U.frameserverport == 0) {
+			U.frameserverport = 8080;
+		}
+		if (U.dbl_click_time == 0) {
+			U.dbl_click_time = 350;
+		}
+		if (U.scrcastfps == 0) {
+			U.scrcastfps = 10;
+			U.scrcastwait = 50;
+		}
+		if (U.v2d_min_gridsize == 0) {
+			U.v2d_min_gridsize = 35;
+		}
+		if (U.dragthreshold == 0)
+			U.dragthreshold = 5;
+		if (U.widget_unit == 0)
+			U.widget_unit = 20;
+		if (U.anisotropic_filter <= 0)
+			U.anisotropic_filter = 1;
 
-	if (U.ndof_sensitivity == 0.0f) {
-		U.ndof_sensitivity = 1.0f;
-		U.ndof_flag = NDOF_LOCK_HORIZON |
-		              NDOF_SHOULD_PAN | NDOF_SHOULD_ZOOM | NDOF_SHOULD_ROTATE;
-	}
-	
-	if (U.ndof_orbit_sensitivity == 0.0f) {
-		U.ndof_orbit_sensitivity = U.ndof_sensitivity;
+		if (U.ndof_sensitivity == 0.0f) {
+			U.ndof_sensitivity = 1.0f;
+			U.ndof_flag = NDOF_LOCK_HORIZON |
+						  NDOF_SHOULD_PAN | NDOF_SHOULD_ZOOM | NDOF_SHOULD_ROTATE;
+		}
+		
+		if (U.ndof_orbit_sensitivity == 0.0f) {
+			U.ndof_orbit_sensitivity = U.ndof_sensitivity;
 
-		if (!(U.flag & USER_TRACKBALL))
-			U.ndof_flag |= NDOF_TURNTABLE;
+			if (!(U.flag & USER_TRACKBALL))
+				U.ndof_flag |= NDOF_TURNTABLE;
+		}
+		if (U.tweak_threshold == 0)
+			U.tweak_threshold = 10;
 	}
-	if (U.tweak_threshold == 0)
-		U.tweak_threshold = 10;
 
 	if (bmain->versionfile < 265 || (bmain->versionfile == 265 && bmain->subversionfile < 1)) {
 		bTheme *btheme;