[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47408] branches/soc-2011-tomato/source/ blender: code cleanup

Campbell Barton ideasman42 at gmail.com
Mon Jun 4 15:46:50 CEST 2012


Revision: 47408
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47408
Author:   campbellbarton
Date:     2012-06-04 13:46:38 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
code cleanup

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h	2012-06-04 13:24:10 UTC (rev 47407)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h	2012-06-04 13:46:38 UTC (rev 47408)
@@ -129,13 +129,13 @@
 void BKE_mask_layer_shape_from_mask(struct MaskLayer *masklay, struct MaskLayerShape *masklay_shape);
 void BKE_mask_layer_shape_to_mask(struct MaskLayer *masklay, struct MaskLayerShape *masklay_shape);
 void BKE_mask_layer_shape_to_mask_interp(struct MaskLayer *masklay,
-                                          struct MaskLayerShape *masklay_shape_a,
-                                          struct MaskLayerShape *masklay_shape_b,
-                                          const float fac);
+                                         struct MaskLayerShape *masklay_shape_a,
+                                         struct MaskLayerShape *masklay_shape_b,
+                                         const float fac);
 struct MaskLayerShape *BKE_mask_layer_shape_find_frame(struct MaskLayer *masklay, int frame);
 int BKE_mask_layer_shape_find_frame_range(struct MaskLayer *masklay, int frame,
-                                           struct MaskLayerShape **r_masklay_shape_a,
-                                           struct MaskLayerShape **r_masklay_shape_b);
+                                          struct MaskLayerShape **r_masklay_shape_a,
+                                          struct MaskLayerShape **r_masklay_shape_b);
 struct MaskLayerShape *BKE_mask_layer_shape_varify_frame(struct MaskLayer *masklay, int frame);
 void BKE_mask_layer_shape_unlink(struct MaskLayer *masklay, struct MaskLayerShape *masklay_shape);
 void BKE_mask_layer_shape_sort(struct MaskLayer *masklay);

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2012-06-04 13:24:10 UTC (rev 47407)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2012-06-04 13:46:38 UTC (rev 47408)
@@ -325,12 +325,12 @@
 	return feather;
 }
 
-float (*BKE_mask_spline_feather_differentiated_points(MaskSpline * spline, int *tot_feather_point))[2]
+float (*BKE_mask_spline_feather_differentiated_points(MaskSpline *spline, int *tot_feather_point))[2]
 {
 	return BKE_mask_spline_feather_differentiated_points_with_resolution(spline, 0, 0, tot_feather_point);
 }
 
-float (*BKE_mask_spline_feather_points(MaskSpline * spline, int *tot_feather_point))[2]
+float (*BKE_mask_spline_feather_points(MaskSpline *spline, int *tot_feather_point))[2]
 {
 	MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
 
@@ -1939,8 +1939,8 @@
 			diff_points = BKE_mask_spline_differentiate_with_resolution(spline, width, height, &tot_diff_point);
 			if (tot_diff_point) {
 				diff_feather_points =
-					BKE_mask_spline_feather_differentiated_points_with_resolution(spline, width, height,
-					                                                              &tot_diff_feather_points);
+				        BKE_mask_spline_feather_differentiated_points_with_resolution(spline, width, height,
+				                                                                      &tot_diff_feather_points);
 			}
 
 			/* TODO, make this optional! */

Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c	2012-06-04 13:24:10 UTC (rev 47407)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c	2012-06-04 13:46:38 UTC (rev 47408)
@@ -357,8 +357,8 @@
 
 					if (feather) {
 						feather_points = BKE_mask_point_segment_feather_diff_with_resolution(spline, cur_point,
-						                                                     width, height,
-						                                                     &tot_feather_point);
+						                                                                     width, height,
+						                                                                     &tot_feather_point);
 
 						points = feather_points;
 						tot_point = tot_feather_point;




More information about the Bf-blender-cvs mailing list