diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2020-05-14 15:30:34 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2020-05-14 15:30:34 +0300 |
commit | 236794d07a707a5cf4b8aff9d441f88590d69901 (patch) | |
tree | eb309de08263b2c0c5b4928ee1f112b1c3cd60bf /source/blender/blenloader/intern/versioning_defaults.c | |
parent | c9360b239bc7ebe09721b7d740995f01ee7d8bb3 (diff) | |
parent | 7965c735f12b885803933363e9b1ca8e85067af6 (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenloader/intern/versioning_defaults.c')
-rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index fb1cda2ff31..a00cef745e5 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -231,19 +231,17 @@ static void blo_update_defaults_screen(bScreen *screen, /* 2D animation template. */ if (app_template && STREQ(app_template, "2D_Animation")) { LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { - LISTBASE_FOREACH (ARegion *, region, &area->regionbase) { - if (area->spacetype == SPACE_ACTION) { - SpaceAction *saction = area->spacedata.first; - /* Enable Sliders. */ - saction->flag |= SACTION_SLIDERS; - } - else if (area->spacetype == SPACE_VIEW3D) { - View3D *v3d = area->spacedata.first; - /* Set Material Color by default. */ - v3d->shading.color_type = V3D_SHADING_MATERIAL_COLOR; - /* Enable Annotations. */ - v3d->flag2 |= V3D_SHOW_ANNOTATION; - } + if (area->spacetype == SPACE_ACTION) { + SpaceAction *saction = area->spacedata.first; + /* Enable Sliders. */ + saction->flag |= SACTION_SLIDERS; + } + else if (area->spacetype == SPACE_VIEW3D) { + View3D *v3d = area->spacedata.first; + /* Set Material Color by default. */ + v3d->shading.color_type = V3D_SHADING_MATERIAL_COLOR; + /* Enable Annotations. */ + v3d->flag2 |= V3D_SHOW_ANNOTATION; } } } |