[Bf-blender-cvs] [626a786] blender-v2.75-release: Fix T45052: Compositing-Masks are not editable with new DepsGraph

[Sergey Sharybin]

Commit: 626a78607cf4ae574ee9a60821527cd9554d1c28
Author: Sergey Sharybin
Date:   Mon Jun 15 13:39:38 2015 +0200
Branches: blender-v2.75-release
https://developer.blender.org/rB626a78607cf4ae574ee9a60821527cd9554d1c28

Fix T45052: Compositing-Masks are not editable with new DepsGraph

This commit fixes missing updates of masks with the new dependency graph
in a way which is safe for backport into master branch.

Compositor nodes will not receive needed update callback yet, this will
be solved after mask and compositor are becoming a proper node in the
graph, it is considered a TODO now.

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

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

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index bd03706..7894a5e 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1730,15 +1730,16 @@ void BKE_scene_update_tagged(EvaluationContext *eval_ctx, Main *bmain, Scene *sc
 	 * in the future this should handle updates for all datablocks, not
 	 * only objects and scenes. - brecht */
 #ifdef WITH_LEGACY_DEPSGRAPH
-	if (use_new_eval) {
-		DEG_evaluate_on_refresh(eval_ctx, scene->depsgraph, scene);
-	}
-	else {
+	if (!use_new_eval) {
 		scene_update_tagged_recursive(eval_ctx, bmain, scene, scene);
 	}
-#else
-	DEG_evaluate_on_refresh(eval_ctx, scene->depsgraph, scene);
+	else
 #endif
+	{
+		DEG_evaluate_on_refresh(eval_ctx, scene->depsgraph, scene);
+		/* TODO(sergey): This is to beocme a node in new depsgraph. */
+		BKE_mask_update_scene(bmain, scene);
+	}
 
 	/* update sound system animation (TODO, move to depsgraph) */
 	BKE_sound_update_scene(bmain, scene);