diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-01 01:42:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-01 01:42:00 +0300 |
| commit | 29937dce8f518b09838f58abcc42a43fb29bf64f (patch) | |
| tree | 256469286467ecf55abbea85a7a5a10035da3108 /source/blender/blenloader | |
| parent | 7b72be0134887622518f1fb6d6009fa67bf41593 (diff) | |
| parent | e8d58080df07d4b7d9372bfca0dd54ea2817394a (diff) | |
Merge branch 'master' into blender2.8
Move 'View3D.flag3' options into 'gp_flag'.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 5 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index d2a1cc1f4f1..ab787a52cfd 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -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; } } } diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index da3787816d2..c120eed695c 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -449,9 +449,9 @@ void BLO_update_defaults_startup_blend(Main *bmain) for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { View3D *v3d = (View3D *)sl; - v3d->flag3 |= V3D_GP_SHOW_EDIT_LINES; - v3d->flag3 |= V3D_GP_SHOW_MULTIEDIT_LINES; - v3d->flag3 |= V3D_GP_SHOW_ONION_SKIN; + v3d->gp_flag |= V3D_GP_SHOW_EDIT_LINES; + v3d->gp_flag |= V3D_GP_SHOW_MULTIEDIT_LINES; + v3d->gp_flag |= V3D_GP_SHOW_ONION_SKIN; v3d->vertex_opacity = 0.9f; break; } |