[Bf-blender-cvs] [b5b1f9d11c8] blender2.8: Depsgraph: Consider depsgraphs used by workspace as active

Sergey Sharybin noreply at git.blender.org
Thu May 31 18:11:13 CEST 2018


Commit: b5b1f9d11c86032fd2b7a61ce39b8d62e1585cef
Author: Sergey Sharybin
Date:   Thu May 31 13:35:01 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb5b1f9d11c86032fd2b7a61ce39b8d62e1585cef

Depsgraph: Consider depsgraphs used by workspace as active

Will cause some bad behavior when object is shared across multiple
visible view layers with different overrides. Accept it for now,
and possibly force single view layer later.

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

M	source/blender/blenkernel/intern/workspace.c

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

diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index fb768333bb6..b71dfaf5aea 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -505,6 +505,13 @@ void BKE_workspace_update_tagged(Main *bmain,
 	struct Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene,
 	                                                      view_layer,
 	                                                      true);
+	/* TODO(sergey): For now all dependency graphs which are evaluated from
+	 * workspace are considered active. This will work all fine with "locked"
+	 * view layer and time across windows. This is to be granted separately,
+	 * and for until then we have to accept ambiguities when object is shared
+	 * across visible view layers and has overrides on it.
+	 */
+	DEG_make_active(depsgraph);
 	BKE_scene_graph_update_tagged(depsgraph, bmain);
 }



More information about the Bf-blender-cvs mailing list