Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-01-23 17:27:59 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-01-23 17:35:20 +0400
commit26ae14d2dccd0d34edfe9f26a4126e9a69e74983 (patch)
tree0db615fc39b539de9ac28aa7bf6c735a56c6c729 /source/blender/blenkernel/intern/depsgraph.c
parent64bd4be6b2d9d093c56e6cce809d8cd1650ebe6f (diff)
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.
Diffstat (limited to 'source/blender/blenkernel/intern/depsgraph.c')
-rw-r--r--source/blender/blenkernel/intern/depsgraph.c29
1 files changed, 24 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;
+ }
+ }
+ }
}
}
}