griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

3D View: don't override animation template view color

Browse Source 
D4198 by @charlie w/ edits.
This commit is contained in:
Campbell Barton
2019-01-14 18:09:52 +11:00
parent 417cd20257
commit 2e3e94c796
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/versioning_280.c
View File

@@ -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) {

5
source/blender/blenloader/intern/versioning_defaults.c
View File

@@ -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: