[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61001] trunk/blender/source/blender: Code cleanup: more int->bool conversions mask module

Sergey Sharybin sergey.vfx at gmail.com
Tue Oct 29 19:56:21 CET 2013


Revision: 61001
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61001
Author:   nazgul
Date:     2013-10-29 18:56:21 +0000 (Tue, 29 Oct 2013)
Log Message:
-----------
Code cleanup: more int->bool conversions mask module

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_mask.h
    trunk/blender/source/blender/blenkernel/intern/mask.c
    trunk/blender/source/blender/editors/transform/transform_conversions.c

Modified: trunk/blender/source/blender/blenkernel/BKE_mask.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mask.h	2013-10-29 18:46:45 UTC (rev 61000)
+++ trunk/blender/source/blender/blenkernel/BKE_mask.h	2013-10-29 18:56:21 UTC (rev 61001)
@@ -90,7 +90,7 @@
 /* point */
 int BKE_mask_point_has_handle(struct MaskSplinePoint *point);
 void BKE_mask_point_handle(struct MaskSplinePoint *point, float handle[2]);
-void BKE_mask_point_set_handle(struct MaskSplinePoint *point, float loc[2], int keep_direction,
+void BKE_mask_point_set_handle(struct MaskSplinePoint *point, float loc[2], bool keep_direction,
                                float orig_handle[2], float orig_vec[3][3]);
 
 void BKE_mask_point_segment_co(struct MaskSpline *spline, struct MaskSplinePoint *point, float u, float co[2]);

Modified: trunk/blender/source/blender/blenkernel/intern/mask.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask.c	2013-10-29 18:46:45 UTC (rev 61000)
+++ trunk/blender/source/blender/blenkernel/intern/mask.c	2013-10-29 18:56:21 UTC (rev 61001)
@@ -462,7 +462,7 @@
 	handle[1] = (point->bezt.vec[1][1] - vec[0]);
 }
 
-void BKE_mask_point_set_handle(MaskSplinePoint *point, float loc[2], int keep_direction,
+void BKE_mask_point_set_handle(MaskSplinePoint *point, float loc[2], bool keep_direction,
                                float orig_handle[2], float orig_vec[3][3])
 {
 	BezTriple *bezt = &point->bezt;

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2013-10-29 18:46:45 UTC (rev 61000)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2013-10-29 18:56:21 UTC (rev 61001)
@@ -6824,8 +6824,11 @@
 		td->loc2d[1] = td->loc[1] * inv[1];
 		mul_m3_v2(tdm->parent_inverse_matrix, td->loc2d);
 
-		if (tdm->is_handle)
-			BKE_mask_point_set_handle(tdm->point, td->loc2d, t->flag & T_ALT_TRANSFORM, tdm->orig_handle, tdm->vec);
+		if (tdm->is_handle) {
+			BKE_mask_point_set_handle(tdm->point, td->loc2d,
+			                          (t->flag & T_ALT_TRANSFORM) != 0,
+			                          tdm->orig_handle, tdm->vec);
+		}
 	}
 }
 




More information about the Bf-blender-cvs mailing list