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>2015-06-15 14:39:38 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-06-15 14:41:32 +0300
commitd7cd8ff891349b81e17cda0a94a9974db10191b2 (patch)
tree57dc570a128fb2d77cb464cb973d9170a00a2da6 /source/blender/blenkernel/intern/scene.c
parent5b8af1d1f1940a879e81fdb0107eb4cf42455dd2 (diff)
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.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r--source/blender/blenkernel/intern/scene.c13
1 files changed, 7 insertions, 6 deletions
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);