diff options
author | Jacques Lucke <jacques@blender.org> | 2020-04-14 12:59:47 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-04-14 12:59:47 +0300 |
commit | 6692ca602ca6f934ce00da4563434e870e954133 (patch) | |
tree | fe49d439d269f05109d7e29a7776776a9e2bc464 /source/blender/blenloader/intern/versioning_280.c | |
parent | dabd59ba23f877f68aaf73e79f0d58118723d9b7 (diff) | |
parent | b07e8a24f5c69578c5ccae31848bb0f51fd18700 (diff) |
Merge branch 'master' into functionsfunctions
Diffstat (limited to 'source/blender/blenloader/intern/versioning_280.c')
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index ff3aef4588f..d53b6cde4ae 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -4405,6 +4405,17 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 283, 3)) { + /* Color Management Look. */ + for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { + ColorManagedViewSettings *view_settings; + view_settings = &scene->view_settings; + if (BLI_str_startswith(view_settings->look, "Filmic - ")) { + STRNCPY(view_settings->look, view_settings->look + strlen("Filmic - ")); + } + else if (BLI_str_startswith(view_settings->look, "Standard - ")) { + STRNCPY(view_settings->look, view_settings->look + strlen("Standard - ")); + } + } /* Sequencer Tool region */ do_versions_area_ensure_tool_region(bmain, SPACE_SEQ, RGN_FLAG_HIDDEN); @@ -4879,7 +4890,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 283, 12)) { - /* Activate f-curve drawing in the sequencer. */ for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *area = screen->areabase.first; area; area = area->next) { @@ -4918,5 +4928,18 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) */ { /* Keep this block, even when empty. */ + + /* Solidify modifier merge tolerance. */ + if (!DNA_struct_elem_find(fd->filesdna, "SolidifyModifierData", "float", "merge_tolerance")) { + for (Object *ob = bmain->objects.first; ob; ob = ob->id.next) { + for (ModifierData *md = ob->modifiers.first; md; md = md->next) { + if (md->type == eModifierType_Solidify) { + SolidifyModifierData *smd = (SolidifyModifierData *)md; + /* set to 0.0003 since that is what was used before, default now is 0.0001 */ + smd->merge_tolerance = 0.0003f; + } + } + } + } } } |