[Bf-blender-cvs] [90ddcd7] : Correction to previous commit

Campbell Barton noreply at git.blender.org
Wed Mar 12 18:22:20 CET 2014


Commit: 90ddcd7b23d2670e483bbdc0b9d86bb5c3f26fe1
Author: Campbell Barton
Date:   Fri Mar 7 21:17:26 2014 +1100
https://developer.blender.org/rB90ddcd7b23d2670e483bbdc0b9d86bb5c3f26fe1

Correction to previous commit

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

M	source/blender/editors/mask/mask_shapekey.c
M	source/blender/editors/transform/transform_conversions.c

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

diff --git a/source/blender/editors/mask/mask_shapekey.c b/source/blender/editors/mask/mask_shapekey.c
index 9dcc0aa..30c960b 100644
--- a/source/blender/editors/mask/mask_shapekey.c
+++ b/source/blender/editors/mask/mask_shapekey.c
@@ -296,7 +296,7 @@ static int mask_shape_key_rekey_exec(bContext *C, wmOperator *op)
 						masklay_shape_b = masklay_shape;
 						masklay_shape_lastsel = NULL;
 
-						/* this will be freed below, sep over selection */
+						/* this will be freed below, step over selection */
 						masklay_shape_next = masklay_shape->next;
 					}
 				}
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 9190a0d..8dc0c6d 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -3015,7 +3015,7 @@ static int gpf_cmp_frame(void *thunk, void *a, void *b)
 	return 0;
 }
 
-static int maskley_shape_cmp_frame(void *thunk, void *a, void *b)
+static int masklay_shape_cmp_frame(void *thunk, void *a, void *b)
 {
 	MaskLayerShape *frame_a = a;
 	MaskLayerShape *frame_b = b;
@@ -3069,7 +3069,7 @@ static void posttrans_mask_clean(Mask *mask)
 		MaskLayerShape *masklay_shape, *masklay_shape_next;
 		bool is_double = false;
 
-		BLI_sortlist_r(&masklay->splines_shapes, &is_double, maskley_shape_cmp_frame);
+		BLI_sortlist_r(&masklay->splines_shapes, &is_double, masklay_shape_cmp_frame);
 
 		if (is_double) {
 			for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape_next) {




More information about the Bf-blender-cvs mailing list