[Bf-blender-cvs] [2079edea93e] greasepencil-object: Rename BKE_gp_smooth_stroke to BKE_gpencil_smooth_stroke

Antonio Vazquez noreply at git.blender.org
Fri May 11 16:23:46 CEST 2018


Commit: 2079edea93e0223ec2c700c8f14a1c616ad2a9fc
Author: Antonio Vazquez
Date:   Fri May 11 16:23:12 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB2079edea93e0223ec2c700c8f14a1c616ad2a9fc

Rename BKE_gp_smooth_stroke to BKE_gpencil_smooth_stroke

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

M	source/blender/blenkernel/BKE_gpencil.h
M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/editors/gpencil/gpencil_brush.c
M	source/blender/editors/gpencil/gpencil_fill.c
M	source/blender/editors/gpencil/gpencil_paint.c
M	source/blender/modifiers/intern/MOD_gpencilsmooth.c

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

diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index 3fd24716ee0..1c718da886e 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -180,7 +180,7 @@ void BKE_gpencil_simplify_fixed(struct bGPDlayer *gpl, struct bGPDstroke *gps);
 
 void BKE_gpencil_transform(struct bGPdata *gpd, float mat[4][4]);
 
-bool BKE_gp_smooth_stroke(struct bGPDstroke *gps, int i, float inf);
+bool BKE_gpencil_smooth_stroke(struct bGPDstroke *gps, int i, float inf);
 bool BKE_gp_smooth_stroke_strength(struct bGPDstroke *gps, int i, float inf);
 bool BKE_gp_smooth_stroke_thickness(struct bGPDstroke *gps, int i, float inf);
 bool BKE_gp_smooth_stroke_uv(struct bGPDstroke *gps, int i, float inf);
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 707e8db4793..ec888e22ea0 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1400,7 +1400,7 @@ bool BKE_gpencil_vgroup_remove_point_weight(bGPDspoint *pt, int index)
  * \param i                Point index
  * \param inf              Amount of smoothing to apply
  */
-bool BKE_gp_smooth_stroke(bGPDstroke *gps, int i, float inf)
+bool BKE_gpencil_smooth_stroke(bGPDstroke *gps, int i, float inf)
 {
 	bGPDspoint *pt = &gps->points[i];
 	// float pressure = 0.0f;
diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index 78996e5cb4c..e6c32862feb 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -293,7 +293,7 @@ static bool gp_brush_smooth_apply(
 
 	/* perform smoothing */
 	if (gso->settings->flag & GP_BRUSHEDIT_FLAG_APPLY_POSITION) {
-		BKE_gp_smooth_stroke(gps, pt_index, inf);
+		BKE_gpencil_smooth_stroke(gps, pt_index, inf);
 	}
 	if (gso->settings->flag & GP_BRUSHEDIT_FLAG_APPLY_STRENGTH) {
 		BKE_gp_smooth_stroke_strength(gps, pt_index, inf);
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index 32be87136ad..439544401a1 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -871,7 +871,7 @@ static void gpencil_stroke_from_buffer(tGPDfill *tgpf)
 	float smoothfac = 1.0f;
 	for (int r = 0; r < 1; r++) {
 		for (int i = 0; i < gps->totpoints; i++) {
-			BKE_gp_smooth_stroke(gps, i, smoothfac - reduce);
+			BKE_gpencil_smooth_stroke(gps, i, smoothfac - reduce);
 		}
 		reduce += 0.25f;  // reduce the factor
 	}
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 0801c0de93b..06665a7ba2b 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1122,7 +1122,7 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
 			float reduce = 0.0f;
 			for (int r = 0; r < brush->draw_smoothlvl; r++) {
 				for (i = 0; i < gps->totpoints; i++) {
-					BKE_gp_smooth_stroke(gps, i, brush->draw_smoothfac - reduce);
+					BKE_gpencil_smooth_stroke(gps, i, brush->draw_smoothfac - reduce);
 					BKE_gp_smooth_stroke_strength(gps, i, brush->draw_smoothfac);
 				}
 				reduce += 0.25f;  // reduce the factor
diff --git a/source/blender/modifiers/intern/MOD_gpencilsmooth.c b/source/blender/modifiers/intern/MOD_gpencilsmooth.c
index cc119508ece..3ff8540f829 100644
--- a/source/blender/modifiers/intern/MOD_gpencilsmooth.c
+++ b/source/blender/modifiers/intern/MOD_gpencilsmooth.c
@@ -90,7 +90,7 @@ static void deformStroke(ModifierData *md, Depsgraph *UNUSED(depsgraph),
 				val = mmd->factor * weight;
 				/* perform smoothing */
 				if (mmd->flag & GP_SMOOTH_MOD_LOCATION) {
-					BKE_gp_smooth_stroke(gps, i, val);
+					BKE_gpencil_smooth_stroke(gps, i, val);
 				}
 				if (mmd->flag & GP_SMOOTH_MOD_STRENGTH) {
 					BKE_gp_smooth_stroke_strength(gps, i, val);



More information about the Bf-blender-cvs mailing list