[Bf-blender-cvs] [16037ceff06] greasepencil-object: Rename field cur_thickness to curve_thickness

[Antonio Vazquez]

Commit: 16037ceff06f2247f4cfaa35e71bc03cd564b78f
Author: Antonio Vazquez
Date:   Sat May 12 19:46:07 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB16037ceff06f2247f4cfaa35e71bc03cd564b78f

Rename field cur_thickness to curve_thickness

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

M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/writefile.c
M	source/blender/makesdna/DNA_modifier_types.h
M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/intern/MOD_gpencilthick.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index bd5c2f3905c..c5b636236fc 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5382,11 +5382,11 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 		else if (md->type == eModifierType_Gpencil_Thick) {
 			ThickGpencilModifierData *gpmd = (ThickGpencilModifierData *)md;
 
-			gpmd->cur_thickness = newdataadr(fd, gpmd->cur_thickness);
-			if (gpmd->cur_thickness) {
-				direct_link_curvemapping(fd, gpmd->cur_thickness);
+			gpmd->curve_thickness = newdataadr(fd, gpmd->curve_thickness);
+			if (gpmd->curve_thickness) {
+				direct_link_curvemapping(fd, gpmd->curve_thickness);
 				/* initialize the curve. Maybe this could be moved to modififer logic */
-				curvemapping_initialize(gpmd->cur_thickness);
+				curvemapping_initialize(gpmd->curve_thickness);
 			}
 		}
 
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 1d1f2042e3b..e4d6d65f50a 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1616,8 +1616,8 @@ static void write_modifiers(WriteData *wd, ListBase *modbase)
 		else if (md->type == eModifierType_Gpencil_Thick) {
 			ThickGpencilModifierData *gpmd = (ThickGpencilModifierData *)md;
 
-			if (gpmd->cur_thickness) {
-				write_curvemapping(wd, gpmd->cur_thickness);
+			if (gpmd->curve_thickness) {
+				write_curvemapping(wd, gpmd->curve_thickness);
 			}
 		}
 		else if (md->type == eModifierType_Gpencil_Hook) {
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index d85238ac478..eddb900b443 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1700,7 +1700,7 @@ typedef struct ThickGpencilModifierData {
 	int flag;                    /* flags */
 	int thickness;               /* Thickness change */
 	char pad[4];
-	struct CurveMapping *cur_thickness;
+	struct CurveMapping *curve_thickness;
 } ThickGpencilModifierData;
 
 typedef enum eThickGpencil_Flag {
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 7b8152ecdae..4cf06de4399 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -5304,7 +5304,7 @@ static void rna_def_modifier_gpencilthick(BlenderRNA *brna)
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop = RNA_def_property(srna, "curve", PROP_POINTER, PROP_NONE);
-	RNA_def_property_pointer_sdna(prop, NULL, "cur_thickness");
+	RNA_def_property_pointer_sdna(prop, NULL, "curve_thickness");
 	RNA_def_property_ui_text(prop, "Curve", "Custom Thickness Curve");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
diff --git a/source/blender/modifiers/intern/MOD_gpencilthick.c b/source/blender/modifiers/intern/MOD_gpencilthick.c
index faf837d60c4..c6283f2aad5 100644
--- a/source/blender/modifiers/intern/MOD_gpencilthick.c
+++ b/source/blender/modifiers/intern/MOD_gpencilthick.c
@@ -53,9 +53,9 @@ static void initData(ModifierData *md)
 	gpmd->thickness = 0;
 	gpmd->layername[0] = '\0';
 	gpmd->vgname[0] = '\0';
-	gpmd->cur_thickness = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
-	if (gpmd->cur_thickness) {
-		curvemapping_initialize(gpmd->cur_thickness);
+	gpmd->curve_thickness = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+	if (gpmd->curve_thickness) {
+		curvemapping_initialize(gpmd->curve_thickness);
 	}
 }
 
@@ -63,8 +63,8 @@ static void freeData(ModifierData *md)
 {
 	ThickGpencilModifierData *gpmd = (ThickGpencilModifierData *)md;
 
-	if (gpmd->cur_thickness) {
-		curvemapping_free(gpmd->cur_thickness);
+	if (gpmd->curve_thickness) {
+		curvemapping_free(gpmd->curve_thickness);
 	}
 }
 
@@ -73,14 +73,14 @@ static void copyData(const ModifierData *md, ModifierData *target)
 	ThickGpencilModifierData *gmd = (ThickGpencilModifierData *)md;
 	ThickGpencilModifierData *tgmd = (ThickGpencilModifierData *)target;
 
-	if (tgmd->cur_thickness != NULL) {
-		curvemapping_free(tgmd->cur_thickness);
-		tgmd->cur_thickness = NULL;
+	if (tgmd->curve_thickness != NULL) {
+		curvemapping_free(tgmd->curve_thickness);
+		tgmd->curve_thickness = NULL;
 	}
 
 	modifier_copyData_generic(md, target);
 
-	tgmd->cur_thickness = curvemapping_copy(gmd->cur_thickness);
+	tgmd->curve_thickness = curvemapping_copy(gmd->curve_thickness);
 }
 
 /* change stroke thickness */
@@ -116,10 +116,10 @@ static void gp_deformStroke(
 			pt->pressure = 1.0f;
 		}
 		else {
-			if ((mmd->flag & GP_THICK_CUSTOM_CURVE) && (mmd->cur_thickness)) {
+			if ((mmd->flag & GP_THICK_CUSTOM_CURVE) && (mmd->curve_thickness)) {
 				/* normalize value to evaluate curve */
 				float value = (float)i / (gps->totpoints - 1);
-				curvef = curvemapping_evaluateF(mmd->cur_thickness, 0, value);
+				curvef = curvemapping_evaluateF(mmd->curve_thickness, 0, value);
 			}
 
 			pt->pressure += mmd->thickness * weight * curvef;