Merging r38780 through r38818 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / interface / resources.c
index c382fda8ebcbd26c00f995de06b914e04c71e837..9b43a882168426ef5103230acf073de7ca3c51e6 100644 (file)
@@ -1153,10 +1153,11 @@ void init_userdef_do_versions(void)
        }
        if(U.pad_rot_angle==0)
                U.pad_rot_angle= 15;
-       
-       if(U.flag & USER_CUSTOM_RANGE) 
-               vDM_ColorBand_store(&U.coba_weight); /* signal for derivedmesh to use colorband */
-       
+
+       /* signal for derivedmesh to use colorband */
+       /* run incase this was on and is now off in the user prefs [#28096] */
+       vDM_ColorBand_store((U.flag & USER_CUSTOM_RANGE) ? (&U.coba_weight):NULL);
+
        if (bmain->versionfile <= 191) {
                strcpy(U.plugtexdir, U.textudir);
                strcpy(U.sounddir, "/");