2.5: Various
[blender.git] / source / blender / blenloader / intern / readfile.c
index d816708f8a41c1a99a77c0c8fe732a51ab4e416a..c36a287b9811d6dc970e35a825a6fb3a7db2128d 100644 (file)
@@ -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;
                        }
                }
        }