[Bf-blender-cvs] [26ae14d] master: Fix crash when changing space type to 3D space when having multiple windows

[Sergey Sharybin]

Commit: 26ae14d2dccd0d34edfe9f26a4126e9a69e74983
Author: Sergey Sharybin
Date:   Thu Jan 23 19:27:59 2014 +0600
https://developer.blender.org/rB26ae14d2dccd0d34edfe9f26a4126e9a69e74983

Fix crash when changing space type to 3D space when having multiple windows

it is possible that different windows shares scene but displays different
layers. And it's also possible that different areas in the same window will
show different layers.

First case was violated in `dag_current_scene_layers()` which only checked
scene layers only once and if multiple windows shares the same scene only
one window was handled. Now made it so layers from all windows will be
squashed together into a single `DagSceneLayer`. This mainly solves issue
with `DAG_on_visible_update()` which didn't work reliable with multiple
open windows.

Second case required call of `DAG_on_visible_update()` when changing space
are type.

This commit slows things a bit actually because `dag_current_scene_layers()`
is actually called on every main WM loop iteration. It is possible to speed
some logic up perhaps. Not sure it's so much critical to do now because there
are unlikely to be more than few windows open anyway.

Will rather think of skipping all that flushing things if no objects are
tagged for update actually.

===================================================================

M	source/blender/blenkernel/intern/depsgraph.c
M	source/blender/makesrna/intern/rna_screen.c

===================================================================

diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index ed396fb..c6cfaaf 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 85d5781..5f65260 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);