diff options
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c7e82c1fe7f..1773538b2e2 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9768,7 +9768,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } FOREACH_NODETREE_END } - { + if (!MAIN_VERSION_ATLEAST(main, 269, 3)) { bScreen *sc; ScrArea *sa; SpaceLink *sl; @@ -9834,25 +9834,27 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } for (scene = main->scene.first; scene; scene = scene->id.next) { - if (scene->gm.matmode == GAME_MAT_TEXFACE) { + /* this can now be turned off */ + ToolSettings *ts= scene->toolsettings; + if (ts->sculpt) + ts->sculpt->flags |= SCULPT_DYNTOPO_SUBDIVIDE; + + /* single texture mode removed from game engine */ + if (scene->gm.matmode == GAME_MAT_TEXFACE) scene->gm.matmode = GAME_MAT_MULTITEX; - } - } - /* 'Increment' mode disabled for nodes, use true grid snapping instead */ - for (scene = main->scene.first; scene; scene = scene->id.next) { + /* 'Increment' mode disabled for nodes, use true grid snapping instead */ if (scene->toolsettings->snap_node_mode == SCE_SNAP_MODE_INCREMENT) scene->toolsettings->snap_node_mode = SCE_SNAP_MODE_GRID; - } - /* Update for removed "sound-only" option in FFMPEG export settings. */ #ifdef WITH_FFMPEG - for (scene = main->scene.first; scene; scene = scene->id.next) { + /* Update for removed "sound-only" option in FFMPEG export settings. */ if (scene->r.ffcodecdata.type >= FFMPEG_INVALID) { scene->r.ffcodecdata.type = FFMPEG_AVI; } - } #endif + + } } /* WATCH IT!!!: pointers from libdata have not been converted yet here! */ |