archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source 
Move 'View3D.flag3' options into 'gp_flag'.
This commit is contained in:
Campbell Barton
2018-08-01 08:42:00 +10:00
parent 7b72be0134 e8d58080df
commit 29937dce8f
9 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1645,9 +1645,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_VIEW3D) {
View3D *v3d = (View3D *)sl;
v3d->shading.background_type = (
(v3d->flag3 & V3D_SHOW_WORLD) ?
V3D_SHADING_BACKGROUND_WORLD : V3D_SHADING_BACKGROUND_THEME);
copy_v3_fl(v3d->shading.background_color, 0.05f);
}
}
@@ -1743,7 +1740,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
if (sl->spacetype == SPACE_VIEW3D) {
View3D *v3d = (View3D *)sl;
v3d->vertex_opacity = 1.0f;
v3d->flag3 |= V3D_GP_SHOW_EDIT_LINES;
v3d->gp_flag |= V3D_GP_SHOW_EDIT_LINES;
}
}
}