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:
authorPhilipp Oeser <info@graphics-engineer.com>2018-12-29 19:15:28 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-01-23 17:12:53 +0300
commitdb78a8ee2e8c365804c8a4a4adab9ebea6977307 (patch)
tree366773773ec603af86927210e06ff4bea5ec9391 /source/blender/render
parentddc278da24a784c613dc43e99da6b52f6558aab5 (diff)
Fix T59939: Masks not Animating in Render
For now this is not part of copy-on-write, and needs extra animation evaluation. Reviewers: sergey, brecht Maniphest Tasks: T59939 Differential Revision: https://developer.blender.org/D4140
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/pipeline.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index f5dc638c3f6..35c85bb3292 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -70,6 +70,7 @@
#include "BKE_layer.h"
#include "BKE_library.h"
#include "BKE_library_remap.h"
+#include "BKE_mask.h"
#include "BKE_modifier.h"
#include "BKE_node.h"
#include "BKE_object.h"
@@ -1628,6 +1629,9 @@ static void do_render_all_options(Render *re)
* work with copy-on-write. */
BKE_animsys_evaluate_all_animation(re->main, NULL, re->scene, (float)cfra);
+ /* Update for masks (these do not use animsys but own lighter weight structure to define animation). */
+ BKE_mask_evaluate_all_masks(re->main, (float)cfra, true);
+
if (RE_engine_render(re, 1)) {
/* in this case external render overrides all */
}