diff options
| -rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 29 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_screen.c | 6 |
2 files changed, 30 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index ed396fb32e3..c6cfaaf2bcb 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -2088,17 +2088,36 @@ static void dag_current_scene_layers(Main *bmain, ListBase *lb) for (win = wm->windows.first; win; win = win->next) { if (win->screen && win->screen->scene->theDag) { Scene *scene = win->screen->scene; - + DagSceneLayer *dsl; + if (scene->id.flag & LIB_DOIT) { - DagSceneLayer *dsl = MEM_mallocN(sizeof(DagSceneLayer), "dag scene layer"); - + dsl = MEM_mallocN(sizeof(DagSceneLayer), "dag scene layer"); + BLI_addtail(lb, dsl); - + dsl->scene = scene; dsl->layer = BKE_screen_visible_layers(win->screen, scene); - + scene->id.flag &= ~LIB_DOIT; } + else { + /* It is possible that multiple windows shares the same scene + * and have different layers visible. + * + * Here we deal with such cases by squashing layers bits from + * multiple windoew to the DagSceneLayer. + * + * TODO(sergey): Such a lookup could be optimized perhaps, + * however should be fine for now since we usually have only + * few open windows. + */ + for (dsl = lb->first; dsl; dsl = dsl->next) { + if (dsl->scene == scene) { + dsl->layer |= BKE_screen_visible_layers(win->screen, scene); + break; + } + } + } } } } diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c index 85d57811187..5f652601637 100644 --- a/source/blender/makesrna/intern/rna_screen.c +++ b/source/blender/makesrna/intern/rna_screen.c @@ -56,6 +56,7 @@ EnumPropertyItem region_type_items[] = { #ifdef RNA_RUNTIME #include "BKE_global.h" +#include "BKE_depsgraph.h" #include "UI_view2d.h" @@ -141,6 +142,11 @@ static void rna_Area_type_update(bContext *C, PointerRNA *ptr) ED_area_newspace(C, sa, sa->butspacetype); ED_area_tag_redraw(sa); + /* It is possible that new layers becomes visible. */ + if (sa->spacetype == SPACE_VIEW3D) { + DAG_on_visible_update(CTX_data_main(C), FALSE); + } + CTX_wm_window_set(C, prevwin); CTX_wm_area_set(C, prevsa); CTX_wm_region_set(C, prevar); |