[Bf-blender-cvs] [ad9ed385946] greasepencil-object: Cleanup: Rename field falloff to multi_frame_falloff

[Antonio Vazquez]

Commit: ad9ed385946bd5abd2a42f09dbafd6559fb241e8
Author: Antonio Vazquez
Date:   Sat May 12 18:29:35 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBad9ed385946bd5abd2a42f09dbafd6559fb241e8

Cleanup: Rename field falloff to multi_frame_falloff

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

M	source/blender/editors/transform/transform.c
M	source/blender/editors/transform/transform_conversions.c
M	source/blender/makesdna/DNA_gpencil_types.h

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

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 62f2e10e6b6..272135243e6 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -3501,7 +3501,7 @@ static void ElementResize(TransInfo *t, TransDataContainer *tc, TransData *td, f
 	/* grease pencil falloff */
 	if (t->options & CTX_GPENCIL_STROKES) {
 		bGPDstroke *gps = (bGPDstroke *)td->extra;
-		mul_v3_fl(vec, td->factor * gps->falloff);
+		mul_v3_fl(vec, td->factor * gps->multi_frame_falloff);
 
 		/* scale stroke thickness */
 		if (td->val) {
@@ -3509,7 +3509,7 @@ static void ElementResize(TransInfo *t, TransDataContainer *tc, TransData *td, f
 			applyNumInput(&t->num, t->values);
 
 			float ratio = t->values[0];
-			*td->val = td->ival * ratio * gps->falloff;
+			*td->val = td->ival * ratio * gps->multi_frame_falloff;
 			CLAMP_MIN(*td->val, 0.001f);
 		}
 
@@ -3877,7 +3877,7 @@ static void ElementRotation_ex(TransInfo *t, TransDataContainer *tc, TransData *
 			float sy = smat[1][1];
 			float sz = smat[2][2];
 
-			mul_m3_fl(smat, gps->falloff);
+			mul_m3_fl(smat, gps->multi_frame_falloff);
 			/* fix scale */
 			smat[0][0] = sx;
 			smat[1][1] = sy;
@@ -4561,7 +4561,7 @@ static void applyTranslationValue(TransInfo *t, const float vec[3])
 			if (t->options & CTX_GPENCIL_STROKES) {
 				/* grease pencil multiframe falloff */
 				bGPDstroke *gps = (bGPDstroke *)td->extra;
-				mul_v3_fl(tvec, td->factor * gps->falloff);
+				mul_v3_fl(tvec, td->factor * gps->multi_frame_falloff);
 			}
 			else {
 				/* proportional editing falloff */
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 6669bc1effb..c3414eda6e1 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -8240,7 +8240,7 @@ static void createTransGPencil(bContext *C, TransInfo *t)
 							}
 #endif
 							/* save falloff factor */
-							gps->falloff = falloff;
+							gps->multi_frame_falloff = falloff;
 
 							/* add all necessary points... */
 							for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 8a1b81ba69a..634709676c0 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -174,7 +174,7 @@ typedef struct bGPDstroke {
 	/* temporary layer name only used during copy/paste to put the stroke in the original layer */
 	char tmp_layerinfo[128];
 
-	float falloff;          /* runtime falloff factor (only for transform) */
+	float multi_frame_falloff; /* runtime falloff factor (only for transform) */
 	int mat_nr;             /* material index */
 } bGPDstroke;