diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-07-30 01:28:18 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-30 01:28:18 +0400 |
| commit | 29f214f7f31bf7490b0c2795ad716ce5a9dc1818 (patch) | |
| tree | fa9cb969c253e58c71c0dd61e89731f185849030 /source/blender/editors/interface/resources.c | |
| parent | ce1c78e18bf41115a8a149dd85115292c1919bea (diff) | |
| parent | 6a27da310c61b3372d565060506221a5afb9fe43 (diff) | |
Merging up to trunk r38834.
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 7cb274f04c6..2465c734aa0 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, "/"); |