diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-14 10:09:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-14 10:12:13 +0300 |
| commit | 2e3e94c7962fb02e8081489886a2c1efa545e860 (patch) | |
| tree | f69b09199800336e10b1630ab94fbffa761e45c6 /source/blender/blenloader | |
| parent | 417cd20257e6648135f9a4a7e38b1c8a6d6da060 (diff) | |
3D View: don't override animation template view color
D4198 by @charlie w/ edits.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 572140a835e..bd21ade9413 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -1779,7 +1779,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - if (!DNA_struct_elem_find(fd->filesdna, "View3DShadeing", "char", "background_type")) { + if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "char", "background_type")) { for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 91cd0bdc670..26552638dde 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -137,7 +137,10 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) /* grease pencil settings */ v3d->vertex_opacity = 1.0f; v3d->gp_flag |= V3D_GP_SHOW_EDIT_LINES; - copy_v3_fl(v3d->shading.background_color, 0.05f); + /* Skip startups that use the viewport color by default. */ + if (v3d->shading.background_type != V3D_SHADING_BACKGROUND_VIEWPORT) { + copy_v3_fl(v3d->shading.background_color, 0.05f); + } break; } case SPACE_FILE: |