diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-07-29 11:58:03 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-07-29 11:58:03 +0400 |
| commit | 24def76ac899e106b4a04364504ba0cbc100d7f7 (patch) | |
| tree | 150a4593cbd3054ab5f10df2ccda6a0fb0c82cd9 /source/blender/editors/interface/resources.c | |
| parent | d55f6c64a24c9e8e46f2a7d33da17aff24ce6d1a (diff) | |
svn merge -r38753:38813 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
Diffstat (limited to 'source/blender/editors/interface/resources.c')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 5f405a5f51e..cdc839e084a 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1115,10 +1115,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, "/"); |