[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47604] trunk/blender/source/blender/ blenkernel: support for subframe animation evaluation for masks.

[Campbell Barton]

Revision: 47604
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47604
Author:   campbellbarton
Date:     2012-06-08 09:35:51 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
support for subframe animation evaluation for masks.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_mask.h
    trunk/blender/source/blender/blenkernel/intern/mask.c
    trunk/blender/source/blender/blenkernel/intern/sequencer.c

Modified: trunk/blender/source/blender/blenkernel/BKE_mask.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mask.h	2012-06-08 09:27:40 UTC (rev 47603)
+++ trunk/blender/source/blender/blenkernel/BKE_mask.h	2012-06-08 09:35:51 UTC (rev 47604)
@@ -120,7 +120,7 @@
 void BKE_mask_update_display(struct Mask *mask, float ctime);
 
 void BKE_mask_evaluate_all_masks(struct Main *bmain, float ctime, const int do_newframe);
-void BKE_mask_evaluate(struct Mask *mask, float ctime, const int do_newframe);
+void BKE_mask_evaluate(struct Mask *mask, const float ctime, const int do_newframe);
 void BKE_mask_update_scene(struct Main *bmain, struct Scene *scene, const int do_newframe);
 void BKE_mask_parent_init(struct MaskParent *parent);
 void BKE_mask_calc_handle_adjacent_interp(struct MaskSpline *spline, struct MaskSplinePoint *point, const float u);
@@ -145,7 +145,7 @@
                                          struct MaskLayerShape *masklay_shape_b,
                                          const float fac);
 struct MaskLayerShape *BKE_mask_layer_shape_find_frame(struct MaskLayer *masklay, const int frame);
-int BKE_mask_layer_shape_find_frame_range(struct MaskLayer *masklay, const int frame,
+int BKE_mask_layer_shape_find_frame_range(struct MaskLayer *masklay, const float frame,
                                           struct MaskLayerShape **r_masklay_shape_a,
                                           struct MaskLayerShape **r_masklay_shape_b);
 struct MaskLayerShape *BKE_mask_layer_shape_alloc(struct MaskLayer *masklay, const int frame);

Modified: trunk/blender/source/blender/blenkernel/intern/mask.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask.c	2012-06-08 09:27:40 UTC (rev 47603)
+++ trunk/blender/source/blender/blenkernel/intern/mask.c	2012-06-08 09:35:51 UTC (rev 47604)
@@ -1463,7 +1463,7 @@
 	}
 }
 
-void BKE_mask_evaluate(Mask *mask, float ctime, const int do_newframe)
+void BKE_mask_evaluate(Mask *mask, const float ctime, const int do_newframe)
 {
 	MaskLayer *masklay;
 
@@ -1475,7 +1475,7 @@
 			MaskLayerShape *masklay_shape_b;
 			int found;
 
-			if ((found = BKE_mask_layer_shape_find_frame_range(masklay, (int)ctime,
+			if ((found = BKE_mask_layer_shape_find_frame_range(masklay, ctime,
 			                                                   &masklay_shape_a, &masklay_shape_b)))
 			{
 				if (found == 1) {
@@ -1750,7 +1750,7 @@
 }
 
 /* when returning 2 - the frame isnt found but before/after frames are */
-int BKE_mask_layer_shape_find_frame_range(MaskLayer *masklay, const int frame,
+int BKE_mask_layer_shape_find_frame_range(MaskLayer *masklay, const float frame,
                                           MaskLayerShape **r_masklay_shape_a,
                                           MaskLayerShape **r_masklay_shape_b)
 {

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-06-08 09:27:40 UTC (rev 47603)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-06-08 09:35:51 UTC (rev 47604)
@@ -2067,7 +2067,7 @@
 		return NULL;
 	}
 
-	BKE_mask_evaluate(seq->mask, (int)(seq->mask->sfra + nr), TRUE);
+	BKE_mask_evaluate(seq->mask, seq->mask->sfra + nr, TRUE);
 
 	maskbuf = MEM_callocN(sizeof(float) * context.rectx * context.recty, __func__);