[Bf-blender-cvs] [18a6ebb] master: Code Cleanup - Fix comments

Joshua Leung noreply at git.blender.org
Fri Feb 26 07:15:40 CET 2016


Commit: 18a6ebbc3a46ba3e2f4608de6e91b36a88873670
Author: Joshua Leung
Date:   Fri Feb 26 14:39:50 2016 +1300
Branches: master
https://developer.blender.org/rB18a6ebbc3a46ba3e2f4608de6e91b36a88873670

Code Cleanup - Fix comments

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

M	source/blender/editors/animation/keyframes_edit.c

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

diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c
index ba98702..676b792 100644
--- a/source/blender/editors/animation/keyframes_edit.c
+++ b/source/blender/editors/animation/keyframes_edit.c
@@ -547,9 +547,9 @@ static bool bezier_region_lasso_test(
 {
 	if (BLI_rctf_isect_pt_v(data_lasso->rectf_scaled, xy)) {
 		float xy_view[2];
-
+		
 		BLI_rctf_transform_pt_v(data_lasso->rectf_view, data_lasso->rectf_scaled, xy_view, xy);
-
+		
 		if (BLI_lasso_is_point_inside(data_lasso->mcords, data_lasso->mcords_tot, xy_view[0], xy_view[1], INT_MAX)) {
 			return true;
 		}
@@ -560,16 +560,14 @@ static bool bezier_region_lasso_test(
 
 static short ok_bezier_region_lasso(KeyframeEditData *ked, BezTriple *bezt)
 {
-	/* rect is stored in data property (it's of type rectf, but may not be set) */
+	/* check for lasso customdata (KeyframeEdit_LassoData) */
 	if (ked->data) {
 		short ok = 0;
-
+		
 #define KEY_CHECK_OK(_index) bezier_region_lasso_test(ked->data, bezt->vec[_index])
 		KEYFRAME_OK_CHECKS(KEY_CHECK_OK);
 #undef KEY_CHECK_OK
-
-		/* check for lasso */
-
+		
 		/* return ok flags */
 		return ok;
 	}
@@ -586,9 +584,9 @@ static bool bezier_region_circle_test(
 {
 	if (BLI_rctf_isect_pt_v(data_circle->rectf_scaled, xy)) {
 		float xy_view[2];
-
+		
 		BLI_rctf_transform_pt_v(data_circle->rectf_view, data_circle->rectf_scaled, xy_view, xy);
-
+		
 		xy_view[0] = xy_view[0] - data_circle->mval[0];
 		xy_view[1] = xy_view[1] - data_circle->mval[1];
 		return len_squared_v2(xy_view) < data_circle->radius_squared;
@@ -600,14 +598,14 @@ static bool bezier_region_circle_test(
 
 static short ok_bezier_region_circle(KeyframeEditData *ked, BezTriple *bezt)
 {
-	/* rect is stored in data property (it's of type rectf, but may not be set) */
+	/* check for circle select customdata (KeyframeEdit_CircleData) */
 	if (ked->data) {
 		short ok = 0;
-
+		
 #define KEY_CHECK_OK(_index) bezier_region_circle_test(ked->data, bezt->vec[_index])
 		KEYFRAME_OK_CHECKS(KEY_CHECK_OK);
 #undef KEY_CHECK_OK
-
+		
 		/* return ok flags */
 		return ok;
 	}
@@ -634,7 +632,7 @@ KeyframeEditFunc ANIM_editkeyframes_ok(short mode)
 			return ok_bezier_region;
 		case BEZT_OK_REGION_LASSO: /* only if the point falls within KeyframeEdit_LassoData defined data */
 			return ok_bezier_region_lasso;
-		case BEZT_OK_REGION_CIRCLE: /* only if the point falls within KeyframeEdit_LassoData defined data */
+		case BEZT_OK_REGION_CIRCLE: /* only if the point falls within KeyframeEdit_CircleData defined data */
 			return ok_bezier_region_circle;
 		default: /* nothing was ok */
 			return NULL;




More information about the Bf-blender-cvs mailing list