[Bf-blender-cvs] [d55b5603f54] greasepencil-object: Fix casting to bool before checking the flag
Campbell Barton
noreply at git.blender.org
Fri Oct 13 19:35:08 CEST 2017
Commit: d55b5603f54f8ec2300e483263802aff41f7e1fd
Author: Campbell Barton
Date: Sat Oct 14 04:35:54 2017 +1100
Branches: greasepencil-object
https://developer.blender.org/rBd55b5603f54f8ec2300e483263802aff41f7e1fd
Fix casting to bool before checking the flag
===================================================================
M source/blender/blenkernel/intern/gpencil_modifier.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 963956e9c6e..780545f2cd9 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -198,7 +198,7 @@ void BKE_gpencil_noise_modifier(
if (!is_stroke_affected_by_modifier(
mmd->layername, mmd->passindex, 3, gpl, gps,
- (bool) mmd->flag & GP_NOISE_INVERSE_LAYER, (bool)mmd->flag & GP_NOISE_INVERSE_PASS))
+ mmd->flag & GP_NOISE_INVERSE_LAYER, mmd->flag & GP_NOISE_INVERSE_PASS))
{
return;
}
@@ -319,7 +319,7 @@ void BKE_gpencil_subdiv_modifier(
if (!is_stroke_affected_by_modifier(
mmd->layername, mmd->passindex, 3, gpl, gps,
- (bool)mmd->flag & GP_SUBDIV_INVERSE_LAYER, (bool)mmd->flag & GP_SUBDIV_INVERSE_PASS))
+ mmd->flag & GP_SUBDIV_INVERSE_LAYER, mmd->flag & GP_SUBDIV_INVERSE_PASS))
{
return;
}
@@ -402,7 +402,7 @@ void BKE_gpencil_thick_modifier(
if (!is_stroke_affected_by_modifier(
mmd->layername, mmd->passindex, 3, gpl, gps,
- (bool)mmd->flag & GP_THICK_INVERSE_LAYER, (bool)mmd->flag & GP_THICK_INVERSE_PASS))
+ mmd->flag & GP_THICK_INVERSE_LAYER, mmd->flag & GP_THICK_INVERSE_PASS))
{
return;
}
@@ -436,7 +436,7 @@ void BKE_gpencil_tint_modifier(
if (!is_stroke_affected_by_modifier(
mmd->layername, mmd->passindex, 1, gpl, gps,
- (bool)mmd->flag & GP_TINT_INVERSE_LAYER, (bool)mmd->flag & GP_TINT_INVERSE_PASS))
+ mmd->flag & GP_TINT_INVERSE_LAYER, mmd->flag & GP_TINT_INVERSE_PASS))
{
return;
}
@@ -474,7 +474,7 @@ void BKE_gpencil_color_modifier(
float hsv[3], factor[3];
if (!is_stroke_affected_by_modifier(
mmd->layername, mmd->passindex, 1, gpl, gps,
- (bool)mmd->flag & GP_COLOR_INVERSE_LAYER, (bool)mmd->flag & GP_COLOR_INVERSE_PASS))
+ mmd->flag & GP_COLOR_INVERSE_LAYER, mmd->flag & GP_COLOR_INVERSE_PASS))
{
return;
}
@@ -505,7 +505,7 @@ void BKE_gpencil_opacity_modifier(
if (!is_stroke_affected_by_modifier(
mmd->layername, mmd->passindex, 3, gpl, gps,
- (bool)mmd->flag & GP_OPACITY_INVERSE_LAYER, (bool)mmd->flag & GP_OPACITY_INVERSE_PASS))
+ mmd->flag & GP_OPACITY_INVERSE_LAYER, mmd->flag & GP_OPACITY_INVERSE_PASS))
{
return;
}
@@ -582,7 +582,7 @@ void BKE_gpencil_dupli_modifier(
stroke++;
if (!is_stroke_affected_by_modifier(
mmd->layername, mmd->passindex, 1, gpl, gps,
- (bool)mmd->flag & GP_DUPLI_INVERSE_LAYER, (bool)mmd->flag & GP_DUPLI_INVERSE_PASS))
+ mmd->flag & GP_DUPLI_INVERSE_LAYER, mmd->flag & GP_DUPLI_INVERSE_PASS))
{
continue;
}
@@ -758,7 +758,7 @@ void BKE_gpencil_lattice_modifier(
if (!is_stroke_affected_by_modifier(
mmd->layername, mmd->passindex, 3, gpl, gps,
- (bool)mmd->flag & GP_LATTICE_INVERSE_LAYER, (bool)mmd->flag & GP_LATTICE_INVERSE_PASS))
+ mmd->flag & GP_LATTICE_INVERSE_LAYER, mmd->flag & GP_LATTICE_INVERSE_PASS))
{
return;
}
@@ -948,7 +948,7 @@ void BKE_gpencil_simplify_modifier(int UNUSED(id), GpencilSimplifyModifierData *
{
if (!is_stroke_affected_by_modifier(
mmd->layername, mmd->passindex, 4, gpl, gps,
- (bool)mmd->flag & GP_SIMPLIFY_INVERSE_LAYER, (bool)mmd->flag & GP_SIMPLIFY_INVERSE_PASS))
+ mmd->flag & GP_SIMPLIFY_INVERSE_LAYER, mmd->flag & GP_SIMPLIFY_INVERSE_PASS))
{
return;
}
More information about the Bf-blender-cvs
mailing list