[Bf-blender-cvs] [db78a8ee2e8] master: Fix T59939: Masks not Animating in Render

[Philipp Oeser]

Commit: db78a8ee2e8c365804c8a4a4adab9ebea6977307
Author: Philipp Oeser
Date:   Sat Dec 29 17:15:28 2018 +0100
Branches: master
https://developer.blender.org/rBdb78a8ee2e8c365804c8a4a4adab9ebea6977307

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

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

M	source/blender/render/intern/source/pipeline.c

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

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 */
 	}