From d7cd8ff891349b81e17cda0a94a9974db10191b2 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 15 Jun 2015 13:39:38 +0200 Subject: 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. --- source/blender/blenkernel/intern/scene.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index bd03706c5b8..7894a5e07c5 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); -- cgit v1.2.3