diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-09 23:49:04 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-09 23:49:04 +0400 |
commit | 9241559ab4c223d30a949f2e06c776642b69715c (patch) | |
tree | 7e0f47e588eb5e515cc8080d412e04cc54187df5 /source/blender/blenloader/intern/readfile.c | |
parent | d091856486cffc4351d6ded86de3c33afb3155b4 (diff) |
2.5: Various
* Weight paint: brush strength was changed to both define weight
and strength, this can't work, made them separate buttons.
* Allow adding particle system as modifier (fix crash).
* 3D view modal ops (zoom ..) could not be ended when invoked
from a button.
* Fix some warnings.
* Fix spelling in particle RNA property.
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index d816708f8a4..c36a287b981 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9009,14 +9009,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main) //do_versions_ipos_to_animato(main); /* toolsettings */ - for(scene= main->scene.first; scene; scene= scene->id.next) { + for(scene= main->scene.first; scene; scene= scene->id.next) scene->r.audio = scene->audio; - - if(!scene->toolsettings->uv_selectmode) { - scene->toolsettings->uv_selectmode= UV_SELECT_VERTEX; - scene->toolsettings->vgroup_weight= 1.0f; - } - } /* shader, composit and texture node trees have id.name empty, put something in * to have them show in RNA viewer and accessible otherwise. @@ -9152,10 +9146,12 @@ static void do_versions(FileData *fd, Library *lib, Main *main) for(sce = main->scene.first; sce; sce = sce->id.next) { ts= sce->toolsettings; - if(ts->normalsize == 0.0) { + if(ts->normalsize == 0.0 || !ts->uv_selectmode || ts->vgroup_weight == 0.0) { ts->normalsize= 0.1f; ts->selectmode= SCE_SELECT_VERTEX; ts->autokey_mode= U.autokey_mode; + ts->uv_selectmode= UV_SELECT_VERTEX; + ts->vgroup_weight= 1.0f; } } } |