Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-10-07 14:52:53 +0300
committerCampbell Barton <campbell@blender.org>2022-10-07 14:55:03 +0300
commit331f8500569df9b3b2aa776c5bcaad7b99c57295 (patch)
tree93547846177ff3415f9564ca54cb8f13433755cf /source/blender/gpencil_modifiers/intern
parent11abeae99fdbfc8f047c4a3c1d2b9b8c47883516 (diff)
Cleanup: redundant parenthesis
Diffstat (limited to 'source/blender/gpencil_modifiers/intern')
-rw-r--r--source/blender/gpencil_modifiers/intern/MOD_gpencillength.c2
-rw-r--r--source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c7
-rw-r--r--source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c4
-rw-r--r--source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c10
-rw-r--r--source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c9
-rw-r--r--source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c6
6 files changed, 18 insertions, 20 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c
index c1a978162b8..b4dac1557f0 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c
@@ -138,7 +138,7 @@ static void applyLength(GpencilModifierData *md,
seed += BLI_hash_string(md->name);
if (lmd->flag & GP_LENGTH_USE_RANDOM) {
- seed += ((int)DEG_get_ctime(depsgraph)) / lmd->step;
+ seed += (int)DEG_get_ctime(depsgraph) / lmd->step;
}
float rand_offset = BLI_hash_int_01(seed);
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 018a13a1c48..ec4cf71e00c 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -145,13 +145,12 @@ static void generateStrokes(GpencilModifierData *md, Depsgraph *depsgraph, Objec
LineartCache *local_lc = gpd->runtime.lineart_cache;
if (!gpd->runtime.lineart_cache) {
MOD_lineart_compute_feature_lines(
- depsgraph, lmd, &gpd->runtime.lineart_cache, (!(ob->dtx & OB_DRAW_IN_FRONT)));
+ depsgraph, lmd, &gpd->runtime.lineart_cache, !(ob->dtx & OB_DRAW_IN_FRONT));
MOD_lineart_destroy_render_data(lmd);
}
else {
if (!(lmd->flags & LRT_GPENCIL_USE_CACHE)) {
- MOD_lineart_compute_feature_lines(
- depsgraph, lmd, &local_lc, (!(ob->dtx & OB_DRAW_IN_FRONT)));
+ MOD_lineart_compute_feature_lines(depsgraph, lmd, &local_lc, !(ob->dtx & OB_DRAW_IN_FRONT));
MOD_lineart_destroy_render_data(lmd);
}
MOD_lineart_chain_clear_picked_flag(local_lc);
@@ -198,7 +197,7 @@ static void bakeModifier(Main *UNUSED(bmain),
lmd->shadow_selection_override = lmd->shadow_selection;
MOD_lineart_compute_feature_lines(
- depsgraph, lmd, &gpd->runtime.lineart_cache, (!(ob->dtx & OB_DRAW_IN_FRONT)));
+ depsgraph, lmd, &gpd->runtime.lineart_cache, !(ob->dtx & OB_DRAW_IN_FRONT));
MOD_lineart_destroy_render_data(lmd);
}
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
index 5af8c0807b8..b04fdeb0a83 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
@@ -199,7 +199,7 @@ static int remapTime(struct GpencilModifierData *md,
sequence_length += ((end - start) * mmd->segments[i].seg_repeat) * 2 + 1;
}
else {
- sequence_length += (((end - start + 1)) * mmd->segments[i].seg_repeat);
+ sequence_length += ((end - start + 1) * mmd->segments[i].seg_repeat);
}
}
segment_arr = MEM_malloc_arrayN(sequence_length, sizeof(int *), __func__);
@@ -389,7 +389,7 @@ static void custom_range_panel_draw(const bContext *UNUSED(C), Panel *panel)
uiLayoutSetPropSep(layout, true);
uiLayoutSetActive(layout,
(mode != GP_TIME_MODE_FIX && mode != GP_TIME_MODE_CHAIN) &&
- (RNA_boolean_get(ptr, "use_custom_frame_range")));
+ RNA_boolean_get(ptr, "use_custom_frame_range"));
col = uiLayoutColumn(layout, true);
uiItemR(col, ptr, "frame_start", 0, IFACE_("Frame Start"), ICON_NONE);
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
index f32141a31eb..c46b83ea052 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
@@ -31,7 +31,7 @@ static LineartEdge *lineart_line_get_connected(LineartBoundingArea *ba,
for (int i = 0; i < ba->line_count; i++) {
LineartEdge *n_e = ba->linked_lines[i];
- if ((!(n_e->flags & LRT_EDGE_FLAG_ALL_TYPE)) || (n_e->flags & LRT_EDGE_FLAG_CHAIN_PICKED)) {
+ if (!(n_e->flags & LRT_EDGE_FLAG_ALL_TYPE) || (n_e->flags & LRT_EDGE_FLAG_CHAIN_PICKED)) {
continue;
}
@@ -186,7 +186,7 @@ void MOD_lineart_chain_feature_lines(LineartData *ld)
LRT_ITER_ALL_LINES_BEGIN
{
- if ((!(e->flags & LRT_EDGE_FLAG_ALL_TYPE)) || (e->flags & LRT_EDGE_FLAG_CHAIN_PICKED)) {
+ if (!(e->flags & LRT_EDGE_FLAG_ALL_TYPE) || (e->flags & LRT_EDGE_FLAG_CHAIN_PICKED)) {
LRT_ITER_ALL_LINES_NEXT
continue;
}
@@ -809,8 +809,8 @@ static LineartChainRegisterEntry *lineart_chain_get_closest_cre(LineartData *ld,
if (!ld->conf.fuzzy_everything) {
if (ld->conf.fuzzy_intersections) {
/* If none of those are intersection lines... */
- if ((!(cre->ec->type & LRT_EDGE_FLAG_INTERSECTION)) &&
- (!(ec->type & LRT_EDGE_FLAG_INTERSECTION))) {
+ if (!(cre->ec->type & LRT_EDGE_FLAG_INTERSECTION) &&
+ !(ec->type & LRT_EDGE_FLAG_INTERSECTION)) {
continue; /* We don't want to chain along different objects at the moment. */
}
}
@@ -1092,7 +1092,7 @@ void MOD_lineart_smooth_chains(LineartData *ld, float tolerance)
eci = next_eci) {
LineartEdgeChainItem *eci2, *eci3, *eci4;
- if ((!(eci2 = eci->next)) || (!(eci3 = eci2->next))) {
+ if (!(eci2 = eci->next) || !(eci3 = eci2->next)) {
/* Not enough points to simplify. */
next_eci = eci->next;
continue;
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index b0e00fa71fb..a8cba959689 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -2891,7 +2891,7 @@ static bool lineart_triangle_edge_image_space_occlusion(const LineartTriangle *t
if ((e->flags & LRT_EDGE_FLAG_PROJECTED_SHADOW) &&
(e->target_reference == tri->target_reference)) {
if (((dot_f > 0) && (e->flags & LRT_EDGE_FLAG_SHADOW_FACING_LIGHT)) ||
- ((dot_f < 0) && (!(e->flags & LRT_EDGE_FLAG_SHADOW_FACING_LIGHT)))) {
+ ((dot_f < 0) && !(e->flags & LRT_EDGE_FLAG_SHADOW_FACING_LIGHT))) {
*from = 0.0f;
*to = 1.0f;
return true;
@@ -3217,8 +3217,7 @@ static bool lineart_triangle_2v_intersection_math(
return false;
}
- if (!(lineart_point_inside_triangle3d(
- gloc, tri->v[0]->gloc, tri->v[1]->gloc, tri->v[2]->gloc))) {
+ if (!lineart_point_inside_triangle3d(gloc, tri->v[0]->gloc, tri->v[1]->gloc, tri->v[2]->gloc)) {
return false;
}
@@ -5256,11 +5255,11 @@ static void lineart_gpencil_generate(LineartCache *cache,
if (ec->shadow_mask_bits != LRT_SHADOW_MASK_UNDEFINED) {
/* TODO(@Yiming): Give a behavior option for how to display undefined shadow info. */
if (shaodow_selection == LRT_SHADOW_FILTER_ILLUMINATED &&
- (!(ec->shadow_mask_bits & LRT_SHADOW_MASK_ILLUMINATED))) {
+ !(ec->shadow_mask_bits & LRT_SHADOW_MASK_ILLUMINATED)) {
continue;
}
if (shaodow_selection == LRT_SHADOW_FILTER_SHADED &&
- (!(ec->shadow_mask_bits & LRT_SHADOW_MASK_SHADED))) {
+ !(ec->shadow_mask_bits & LRT_SHADOW_MASK_SHADED)) {
continue;
}
if (shaodow_selection == LRT_SHADOW_FILTER_ILLUMINATED_ENCLOSED_SHAPES) {
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
index 138c016e2e2..80517979f30 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
@@ -102,12 +102,12 @@ static bool bake_strokes(Object *ob,
}
LineartCache *local_lc = *lc;
if (!(*lc)) {
- MOD_lineart_compute_feature_lines(dg, lmd, lc, (!(ob->dtx & OB_DRAW_IN_FRONT)));
+ MOD_lineart_compute_feature_lines(dg, lmd, lc, !(ob->dtx & OB_DRAW_IN_FRONT));
MOD_lineart_destroy_render_data(lmd);
}
else {
- if (is_first || (!(lmd->flags & LRT_GPENCIL_USE_CACHE))) {
- MOD_lineart_compute_feature_lines(dg, lmd, &local_lc, (!(ob->dtx & OB_DRAW_IN_FRONT)));
+ if (is_first || !(lmd->flags & LRT_GPENCIL_USE_CACHE)) {
+ MOD_lineart_compute_feature_lines(dg, lmd, &local_lc, !(ob->dtx & OB_DRAW_IN_FRONT));
MOD_lineart_destroy_render_data(lmd);
}
MOD_lineart_chain_clear_picked_flag(local_lc);