[Bf-blender-cvs] [0a3c342] master: Fix T46410: VSE Mask ignores animated properties

Campbell Barton noreply at git.blender.org
Thu Oct 8 01:53:09 CEST 2015


Commit: 0a3c3426924f1f3c8e6e1767bbb7e7fdad0233ec
Author: Campbell Barton
Date:   Thu Oct 8 10:46:11 2015 +1100
Branches: master
https://developer.blender.org/rB0a3c3426924f1f3c8e6e1767bbb7e7fdad0233ec

Fix T46410: VSE Mask ignores animated properties

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

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

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

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index b98e7c9..dfdab89 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -3018,6 +3018,7 @@ static ImBuf *seq_render_mask(const SeqRenderData *context, Mask *mask, float nr
 		return NULL;
 	}
 	else {
+		AnimData *adt;
 		Mask *mask_temp;
 		MaskRasterHandle *mr_handle;
 
@@ -3025,6 +3026,10 @@ static ImBuf *seq_render_mask(const SeqRenderData *context, Mask *mask, float nr
 
 		BKE_mask_evaluate(mask_temp, mask->sfra + nr, true);
 
+		/* anim-data */
+		adt = BKE_animdata_from_id(&mask->id);
+		BKE_animsys_evaluate_animdata(context->scene, &mask_temp->id, adt, nr, ADT_RECALC_ANIM);
+
 		maskbuf = MEM_mallocN(sizeof(float) * context->rectx * context->recty, __func__);
 
 		mr_handle = BKE_maskrasterize_handle_new();




More information about the Bf-blender-cvs mailing list