[Bf-blender-cvs] [930a7a7b767] greasepencil-object: Cleanup: Rename function
Antonio Vazquez
noreply at git.blender.org
Sat May 12 21:06:07 CEST 2018
Commit: 930a7a7b76794a0ae923e9fe2481efd47fa7db16
Author: Antonio Vazquez
Date: Sat May 12 21:06:00 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB930a7a7b76794a0ae923e9fe2481efd47fa7db16
Cleanup: Rename function
===================================================================
M source/blender/modifiers/intern/MOD_gpencil_util.c
M source/blender/modifiers/intern/MOD_gpencil_util.h
M source/blender/modifiers/intern/MOD_gpencilhook.c
M source/blender/modifiers/intern/MOD_gpencillattice.c
M source/blender/modifiers/intern/MOD_gpencilnoise.c
M source/blender/modifiers/intern/MOD_gpenciloffset.c
M source/blender/modifiers/intern/MOD_gpencilopacity.c
M source/blender/modifiers/intern/MOD_gpencilsmooth.c
M source/blender/modifiers/intern/MOD_gpencilthick.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_gpencil_util.c b/source/blender/modifiers/intern/MOD_gpencil_util.c
index 197fb8c5aae..ef1cdc794ff 100644
--- a/source/blender/modifiers/intern/MOD_gpencil_util.c
+++ b/source/blender/modifiers/intern/MOD_gpencil_util.c
@@ -103,7 +103,7 @@ bool is_stroke_affected_by_modifier(
}
/* verify if valid vertex group *and return weight */
-float is_point_affected_by_modifier(bGPDspoint *pt, int inverse, int vindex)
+float get_modifier_point_weight(bGPDspoint *pt, int inverse, int vindex)
{
float weight = 1.0f;
diff --git a/source/blender/modifiers/intern/MOD_gpencil_util.h b/source/blender/modifiers/intern/MOD_gpencil_util.h
index f71b721ec6f..63c312e96de 100644
--- a/source/blender/modifiers/intern/MOD_gpencil_util.h
+++ b/source/blender/modifiers/intern/MOD_gpencil_util.h
@@ -41,7 +41,7 @@ bool is_stroke_affected_by_modifier(
struct Object *ob, char *mlayername, int mpassindex, int minpoints,
bGPDlayer *gpl, bGPDstroke *gps, bool inv1, bool inv2);
-float is_point_affected_by_modifier(bGPDspoint *pt, int inverse, int vindex);
+float get_modifier_point_weight(bGPDspoint *pt, int inverse, int vindex);
void gp_mod_fill_random_array(float *ar, int count);
diff --git a/source/blender/modifiers/intern/MOD_gpencilhook.c b/source/blender/modifiers/intern/MOD_gpencilhook.c
index e5e22c2bf38..c1762e0c0be 100644
--- a/source/blender/modifiers/intern/MOD_gpencilhook.c
+++ b/source/blender/modifiers/intern/MOD_gpencilhook.c
@@ -245,7 +245,7 @@ static void gp_deformStroke(
for (int i = 0; i < gps->totpoints; i++) {
bGPDspoint *pt = &gps->points[i];
/* verify vertex group */
- weight = is_point_affected_by_modifier(pt, (int)(!(mmd->flag & GP_HOOK_INVERT_VGROUP) == 0), vindex);
+ weight = get_modifier_point_weight(pt, (int)(!(mmd->flag & GP_HOOK_INVERT_VGROUP) == 0), vindex);
if (weight < 0) {
continue;
}
diff --git a/source/blender/modifiers/intern/MOD_gpencillattice.c b/source/blender/modifiers/intern/MOD_gpencillattice.c
index c6d6602290d..791573c5728 100644
--- a/source/blender/modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/modifiers/intern/MOD_gpencillattice.c
@@ -91,7 +91,7 @@ static void gp_deformStroke(
for (int i = 0; i < gps->totpoints; i++) {
bGPDspoint *pt = &gps->points[i];
/* verify vertex group */
- weight = is_point_affected_by_modifier(pt, (int)(!(mmd->flag & GP_LATTICE_INVERT_VGROUP) == 0), vindex);
+ weight = get_modifier_point_weight(pt, (int)(!(mmd->flag & GP_LATTICE_INVERT_VGROUP) == 0), vindex);
if (weight < 0) {
continue;
}
diff --git a/source/blender/modifiers/intern/MOD_gpencilnoise.c b/source/blender/modifiers/intern/MOD_gpencilnoise.c
index 78e03c7162b..6d9b8ae48c0 100644
--- a/source/blender/modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/modifiers/intern/MOD_gpencilnoise.c
@@ -128,7 +128,7 @@ static void gp_deformStroke(
}
/* verify vertex group */
- weight = is_point_affected_by_modifier(pt0, (int)(!(mmd->flag & GP_NOISE_INVERT_VGROUP) == 0), vindex);
+ weight = get_modifier_point_weight(pt0, (int)(!(mmd->flag & GP_NOISE_INVERT_VGROUP) == 0), vindex);
if (weight < 0) {
continue;
}
diff --git a/source/blender/modifiers/intern/MOD_gpenciloffset.c b/source/blender/modifiers/intern/MOD_gpenciloffset.c
index 6eb5304258f..eb474a34f0f 100644
--- a/source/blender/modifiers/intern/MOD_gpenciloffset.c
+++ b/source/blender/modifiers/intern/MOD_gpenciloffset.c
@@ -85,7 +85,7 @@ static void gp_deformStroke(
bGPDspoint *pt = &gps->points[i];
/* verify vertex group */
- float weight = is_point_affected_by_modifier(pt, (int)(!(mmd->flag & GP_OFFSET_INVERT_VGROUP) == 0), vindex);
+ float weight = get_modifier_point_weight(pt, (int)(!(mmd->flag & GP_OFFSET_INVERT_VGROUP) == 0), vindex);
if (weight < 0) {
continue;
}
diff --git a/source/blender/modifiers/intern/MOD_gpencilopacity.c b/source/blender/modifiers/intern/MOD_gpencilopacity.c
index ce86c2f2253..727dd4a6a48 100644
--- a/source/blender/modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/modifiers/intern/MOD_gpencilopacity.c
@@ -98,7 +98,7 @@ static void gp_deformStroke(
bGPDspoint *pt = &gps->points[i];
/* verify vertex group */
- float weight = is_point_affected_by_modifier(pt, (int)(!(mmd->flag & GP_OPACITY_INVERT_VGROUP) == 0), vindex);
+ float weight = get_modifier_point_weight(pt, (int)(!(mmd->flag & GP_OPACITY_INVERT_VGROUP) == 0), vindex);
if (weight < 0) {
pt->strength += mmd->factor - 1.0f;
}
@@ -117,7 +117,7 @@ static void gp_deformStroke(
pt->strength *= mmd->factor;
}
else {
- float weight = is_point_affected_by_modifier(pt, (int)(!(mmd->flag & GP_OPACITY_INVERT_VGROUP) == 0), vindex);
+ float weight = get_modifier_point_weight(pt, (int)(!(mmd->flag & GP_OPACITY_INVERT_VGROUP) == 0), vindex);
if (weight >= 0) {
pt->strength *= mmd->factor * weight;
}
diff --git a/source/blender/modifiers/intern/MOD_gpencilsmooth.c b/source/blender/modifiers/intern/MOD_gpencilsmooth.c
index 636ffbacae3..9f700c1a28f 100644
--- a/source/blender/modifiers/intern/MOD_gpencilsmooth.c
+++ b/source/blender/modifiers/intern/MOD_gpencilsmooth.c
@@ -83,7 +83,7 @@ static void gp_deformStroke(
for (int i = 0; i < gps->totpoints; i++) {
pt = &gps->points[i];
/* verify vertex group */
- weight = is_point_affected_by_modifier(pt, (int)(!(mmd->flag & GP_SMOOTH_INVERT_VGROUP) == 0), vindex);
+ weight = get_modifier_point_weight(pt, (int)(!(mmd->flag & GP_SMOOTH_INVERT_VGROUP) == 0), vindex);
if (weight < 0) {
continue;
}
diff --git a/source/blender/modifiers/intern/MOD_gpencilthick.c b/source/blender/modifiers/intern/MOD_gpencilthick.c
index 60fc65e42b3..46940317309 100644
--- a/source/blender/modifiers/intern/MOD_gpencilthick.c
+++ b/source/blender/modifiers/intern/MOD_gpencilthick.c
@@ -107,7 +107,7 @@ static void gp_deformStroke(
bGPDspoint *pt = &gps->points[i];
float curvef = 1.0f;
/* verify vertex group */
- float weight = is_point_affected_by_modifier(pt, (int)(!(mmd->flag & GP_THICK_INVERT_VGROUP) == 0), vindex);
+ float weight = get_modifier_point_weight(pt, (int)(!(mmd->flag & GP_THICK_INVERT_VGROUP) == 0), vindex);
if (weight < 0) {
continue;
}
More information about the Bf-blender-cvs
mailing list