Commit: f945303877e65999fbae7a37ba5a223367259396
Author: Antonioya
Date: Tue Jul 31 12:44:01 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf945303877e65999fbae7a37ba5a223367259396
Cleanup: Fix weird comparisons
===================================================================
M source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
index 40e5e718bdc..46d452545e2 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
@@ -253,7 +253,7 @@ static void deformStroke(
MDeformVert *dvert = &gps->dvert[i];
/* verify vertex group */
- weight = get_modifier_point_weight(dvert, (int)(!(mmd->flag &
GP_HOOK_INVERT_VGROUP) == 0), vindex);
+ weight = get_modifier_point_weight(dvert, (int)((mmd->flag &
GP_HOOK_INVERT_VGROUP) != 0), vindex);
if (weight < 0) {
continue;
}
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
index c4ff44af927..33bdb9c861d 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
@@ -98,7 +98,7 @@ static void deformStroke(
MDeformVert *dvert = &gps->dvert[i];
/* verify vertex group */
- weight = get_modifier_point_weight(dvert, (int)(!(mmd->flag &
GP_LATTICE_INVERT_VGROUP) == 0), vindex);
+ weight = get_modifier_point_weight(dvert, (int)((mmd->flag &
GP_LATTICE_INVERT_VGROUP) != 0), vindex);
if (weight < 0) {
continue;
}
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
index 1edcaf84b81..be361498578 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
@@ -154,7 +154,7 @@ static void deformStroke(
}
/* verify vertex group */
- weight = get_modifier_point_weight(dvert, (int)(!(mmd->flag &
GP_NOISE_INVERT_VGROUP) == 0), vindex);
+ weight = get_modifier_point_weight(dvert, (int)((mmd->flag &
GP_NOISE_INVERT_VGROUP) != 0), vindex);
if (weight < 0) {
continue;
}
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
index 50ff3f8766a..a31f889c48a 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
@@ -89,7 +89,7 @@ static void deformStroke(
MDeformVert *dvert = &gps->dvert[i];
/* verify vertex group */
- float weight = get_modifier_point_weight(dvert,
(int)(!(mmd->flag & GP_OFFSET_INVERT_VGROUP) == 0), vindex);
+ float weight = get_modifier_point_weight(dvert,
(int)((mmd->flag & GP_OFFSET_INVERT_VGROUP) != 0), vindex);
if (weight < 0) {
continue;
}
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
index 361668f8725..74b24acdfb6 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
@@ -101,7 +101,7 @@ static void deformStroke(
MDeformVert *dvert = &gps->dvert[i];
/* verify vertex group */
- float weight = get_modifier_point_weight(dvert,
(!(mmd->flag & GP_OPACITY_INVERT_VGROUP) == 0), vindex);
+ float weight = get_modifier_point_weight(dvert,
((mmd->flag & GP_OPACITY_INVERT_VGROUP) != 0), vindex);
if (weight < 0) {
pt->strength += mmd->factor - 1.0f;
}
@@ -121,7 +121,7 @@ static void deformStroke(
pt->strength *= mmd->factor;
}
else {
- float weight = get_modifier_point_weight(dvert,
(!(mmd->flag & GP_OPACITY_INVERT_VGROUP) == 0), vindex);
+ float weight = get_modifier_point_weight(dvert,
((mmd->flag & GP_OPACITY_INVERT_VGROUP) != 0), vindex);
if (weight >= 0) {
pt->strength *= mmd->factor * weight;
}
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
index 182bd974959..b5f2f0349af 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
@@ -86,7 +86,7 @@ static void deformStroke(
MDeformVert *dvert = &gps->dvert[i];
/* verify vertex group */
- weight = get_modifier_point_weight(dvert,
(int)(!(mmd->flag & GP_SMOOTH_INVERT_VGROUP) == 0), vindex);
+ weight = get_modifier_point_weight(dvert,
(int)((mmd->flag & GP_SMOOTH_INVERT_VGROUP) != 0), vindex);
if (weight < 0) {
continue;
}
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
index fb63aa31364..2c01fec1357 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
@@ -111,7 +111,7 @@ static void deformStroke(
MDeformVert *dvert = &gps->dvert[i];
float curvef = 1.0f;
/* verify vertex group */
- float weight = get_modifier_point_weight(dvert,
(int)(!(mmd->flag & GP_THICK_INVERT_VGROUP) == 0), vindex);
+ float weight = get_modifier_point_weight(dvert,
(int)((mmd->flag & GP_THICK_INVERT_VGROUP) != 0), vindex);
if (weight < 0) {
continue;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
