diff options
| author | Campbell Barton <campbell@blender.org> | 2022-09-25 08:14:13 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-09-25 08:34:32 +0300 |
| commit | c9e35c2ced92082c86f1ecb9ecd16c6230218c7c (patch) | |
| tree | 24bd862961d2bbfa022cfc3c5262cfe1e63550b3 | |
| parent | 865894481ce76325d817533c654bda2ce2e65c66 (diff) | |
Cleanup: remove redundant double parenthesis
125 files changed, 194 insertions, 196 deletions
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 98b1e3d0039..82b358b77a1 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -796,10 +796,10 @@ static void collection_object_cache_fill(ListBase *lb, /* Only collection flags are checked here currently, object restrict flag is checked * in FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN since it can be animated * without updating the cache. */ - if (((child_restrict & COLLECTION_HIDE_VIEWPORT) == 0)) { + if ((child_restrict & COLLECTION_HIDE_VIEWPORT) == 0) { base->flag |= BASE_ENABLED_VIEWPORT; } - if (((child_restrict & COLLECTION_HIDE_RENDER) == 0)) { + if ((child_restrict & COLLECTION_HIDE_RENDER) == 0) { base->flag |= BASE_ENABLED_RENDER; } } diff --git a/source/blender/blenkernel/intern/curveprofile.cc b/source/blender/blenkernel/intern/curveprofile.cc index 2f3fc2e95d8..0e34e4a55dd 100644 --- a/source/blender/blenkernel/intern/curveprofile.cc +++ b/source/blender/blenkernel/intern/curveprofile.cc @@ -379,7 +379,7 @@ static void curveprofile_build_supports(CurveProfile *profile) point_init(&profile->path[0], 1.0f, 0.0f, 0, HD_VECT, HD_VECT); point_init(&profile->path[1], 1.0f, 0.5f, 0, HD_VECT, HD_VECT); for (int i = 1; i < n - 2; i++) { - const float x = 1.0f - (0.5f * (1.0f - cosf((float)((i / (float)(n - 3))) * M_PI_2))); + const float x = 1.0f - (0.5f * (1.0f - cosf((float)(i / (float)(n - 3)) * M_PI_2))); const float y = 0.5f + 0.5f * sinf((float)((i / (float)(n - 3)) * M_PI_2)); point_init(&profile->path[i], x, y, 0, HD_AUTO, HD_AUTO); } diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 36f038e68ab..e6afca11b40 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -374,8 +374,8 @@ float data_transfer_interp_float_do(const int mix_mode, { float val_ret; - if (((mix_mode == CDT_MIX_REPLACE_ABOVE_THRESHOLD && (val_dst < mix_factor)) || - (mix_mode == CDT_MIX_REPLACE_BELOW_THRESHOLD && (val_dst > mix_factor)))) { + if ((mix_mode == CDT_MIX_REPLACE_ABOVE_THRESHOLD && (val_dst < mix_factor)) || + (mix_mode == CDT_MIX_REPLACE_BELOW_THRESHOLD && (val_dst > mix_factor))) { return val_dst; /* Do not affect destination. */ } diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 9d46c381d7a..ddffb91cef7 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -1762,7 +1762,7 @@ bool dynamicPaint_resetSurface(const Scene *scene, DynamicPaintSurface *surface) static bool dynamicPaint_checkSurfaceData(const Scene *scene, DynamicPaintSurface *surface) { if (!surface->data || - ((dynamicPaint_surfaceNumOfPoints(surface) != surface->data->total_points))) { + (dynamicPaint_surfaceNumOfPoints(surface) != surface->data->total_points)) { return dynamicPaint_resetSurface(scene, surface); } return true; diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 98c317c547b..f876caf9d91 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -829,8 +829,8 @@ bool IDP_EqualsProperties_ex(IDProperty *prop1, IDProperty *prop2, const bool is case IDP_DOUBLE: return (IDP_Double(prop1) == IDP_Double(prop2)); case IDP_STRING: { - return (((prop1->len == prop2->len) && - STREQLEN(IDP_String(prop1), IDP_String(prop2), (size_t)prop1->len))); + return ((prop1->len == prop2->len) && + STREQLEN(IDP_String(prop1), IDP_String(prop2), (size_t)prop1->len)); } case IDP_ARRAY: if (prop1->len == prop2->len && prop1->subtype == prop2->subtype) { diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index d779fc4f512..220b28a32f1 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -1022,7 +1022,7 @@ static void layer_collection_objects_sync(ViewLayer *view_layer, if ((layer_restrict & LAYER_COLLECTION_HIDE) == 0) { base->flag_from_collection |= BASE_ENABLED_AND_VISIBLE_IN_DEFAULT_VIEWPORT; } - if (((collection_restrict & COLLECTION_HIDE_SELECT) == 0)) { + if ((collection_restrict & COLLECTION_HIDE_SELECT) == 0) { base->flag_from_collection |= BASE_SELECTABLE; } } diff --git a/source/blender/blenkernel/intern/lib_override.cc b/source/blender/blenkernel/intern/lib_override.cc index 3f1b80014ac..7202570f732 100644 --- a/source/blender/blenkernel/intern/lib_override.cc +++ b/source/blender/blenkernel/intern/lib_override.cc @@ -494,8 +494,8 @@ bool BKE_lib_override_library_create_from_tag(Main *bmain, if (id_hierarchy_root != nullptr) { /* If the hierarchy root is given, it must be a valid existing override (used during partial * resync process mainly). */ - BLI_assert((ID_IS_OVERRIDE_LIBRARY_REAL(id_hierarchy_root) && - id_hierarchy_root->override_library->reference->lib == id_root_reference->lib)); + BLI_assert(ID_IS_OVERRIDE_LIBRARY_REAL(id_hierarchy_root) && + id_hierarchy_root->override_library->reference->lib == id_root_reference->lib); if (!do_no_main) { /* When processing within Main, set existing overrides in given hierarchy as 'newid' of their @@ -507,8 +507,8 @@ bool BKE_lib_override_library_create_from_tag(Main *bmain, if (!ELEM(id_hierarchy_root_reference, nullptr, id_root_reference)) { /* If the reference hierarchy root is given, it must be from the same library as the reference * root, and also tagged for override. */ - BLI_assert((id_hierarchy_root_reference->lib == id_root_reference->lib && - (id_hierarchy_root_reference->tag & LIB_TAG_DOIT) != 0)); + BLI_assert(id_hierarchy_root_reference->lib == id_root_reference->lib && + (id_hierarchy_root_reference->tag & LIB_TAG_DOIT) != 0); } const Library *reference_library = id_root_reference->lib; diff --git a/source/blender/blenkernel/intern/lib_remap.c b/source/blender/blenkernel/intern/lib_remap.c index 2ebdc6788d9..addb7b0988c 100644 --- a/source/blender/blenkernel/intern/lib_remap.c +++ b/source/blender/blenkernel/intern/lib_remap.c @@ -183,7 +183,7 @@ static int foreach_libblock_remap_callback(LibraryIDLinkCallbackData *cb_data) /* Better remap to NULL than not remapping at all, * then we can handle it as a regular remap-to-NULL case. */ - if ((cb_flag & IDWALK_CB_NEVER_SELF)) { + if (cb_flag & IDWALK_CB_NEVER_SELF) { id_remapper_options |= ID_REMAP_APPLY_UNMAP_WHEN_REMAPPING_TO_SELF; } diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index 0b8351efdf4..d877620855f 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -308,7 +308,7 @@ BezTriple *BKE_mask_spline_point_next_bezt(MaskSpline *spline, return NULL; } - return &((point + 1))->bezt; + return &(point + 1)->bezt; } MaskSplinePoint *BKE_mask_spline_point_array(MaskSpline *spline) diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index aad19a8b842..fb61c3750a1 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -2168,8 +2168,8 @@ bool ray_face_intersection_tri(const float ray_start[3], float *depth) { float depth_test; - if ((isect_ray_tri_watertight_v3(ray_start, isect_precalc, t0, t1, t2, &depth_test, NULL) && - (depth_test < *depth))) { + if (isect_ray_tri_watertight_v3(ray_start, isect_precalc, t0, t1, t2, &depth_test, NULL) && + (depth_test < *depth)) { *depth = depth_test; return true; } @@ -2214,12 +2214,12 @@ bool ray_face_nearest_quad(const float ray_start[3], float dist_sq_test; float co[3], depth_test; - if (((dist_sq_test = dist_squared_ray_to_tri_v3_fast( - ray_start, ray_normal, t0, t1, t2, co, &depth_test)) < *dist_sq)) { + if ((dist_sq_test = dist_squared_ray_to_tri_v3_fast( + ray_start, ray_normal, t0, t1, t2, co, &depth_test)) < *dist_sq) { *dist_sq = dist_sq_test; *depth = depth_test; - if (((dist_sq_test = dist_squared_ray_to_tri_v3_fast( - ray_start, ray_normal, t0, t2, t3, co, &depth_test)) < *dist_sq)) { + if ((dist_sq_test = dist_squared_ray_to_tri_v3_fast( + ray_start, ray_normal, t0, t2, t3, co, &depth_test)) < *dist_sq) { *dist_sq = dist_sq_test; *depth = depth_test; } @@ -2240,8 +2240,8 @@ bool ray_face_nearest_tri(const float ray_start[3], float dist_sq_test; float co[3], depth_test; - if (((dist_sq_test = dist_squared_ray_to_tri_v3_fast( - ray_start, ray_normal, t0, t1, t2, co, &depth_test)) < *dist_sq)) { + if ((dist_sq_test = dist_squared_ray_to_tri_v3_fast( + ray_start, ray_normal, t0, t1, t2, co, &depth_test)) < *dist_sq) { *dist_sq = dist_sq_test; *depth = depth_test; return true; diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index 70d442021fe..687ee6497b4 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -883,7 +883,7 @@ static void long_edge_queue_edge_add_recursive( return; } - if ((l_edge->radial_next != l_edge)) { + if (l_edge->radial_next != l_edge) { /* How much longer we need to be to consider for subdividing * (avoids subdividing faces which are only *slightly* skinny) */ # define EVEN_EDGELEN_THRESHOLD 1.2f diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index bf1b1586db8..0d12a26276f 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -745,7 +745,7 @@ static bool seq_foreach_member_id_cb(Sequence *seq, void *user_data) { \ CHECK_TYPE(&((_id_super)->id), ID *); \ BKE_lib_query_foreachid_process((_data), (ID **)&(_id_super), (_cb_flag)); \ - if (BKE_lib_query_foreachid_iter_stop((_data))) { \ + if (BKE_lib_query_foreachid_iter_stop(_data)) { \ return false; \ } \ } \ diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index d1451353feb..75f2015cdad 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -750,10 +750,10 @@ static void build_bps_springlist(Object *ob) } /* scan for attached inner springs */ for (b = sb->totspring, bs = sb->bspring; b > 0; b--, bs++) { - if (((sb->totpoint - a) == bs->v1)) { + if ((sb->totpoint - a) == bs->v1) { add_bp_springlist(bp, sb->totspring - b); } - if (((sb->totpoint - a) == bs->v2)) { + if ((sb->totpoint - a) == bs->v2) { add_bp_springlist(bp, sb->totspring - b); } } /* For springs. */ diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c index 300ef0c646f..db2a6b658fa 100644 --- a/source/blender/blenkernel/intern/undo_system.c +++ b/source/blender/blenkernel/intern/undo_system.c @@ -299,7 +299,7 @@ static void undosys_stack_clear_all_last(UndoStack *ustack, UndoStep *us) BLI_assert(us_iter != ustack->step_active); undosys_step_free_and_unlink(ustack, us_iter); undosys_stack_validate(ustack, is_not_empty); - } while ((us != us_iter)); + } while (us != us_iter); } } @@ -320,7 +320,7 @@ static void undosys_stack_clear_all_first(UndoStack *ustack, UndoStep *us, UndoS BLI_assert(us_iter != ustack->step_active); undosys_step_free_and_unlink(ustack, us_iter); undosys_stack_validate(ustack, is_not_empty); - } while ((us != us_iter)); + } while (us != us_iter); } } diff --git a/source/blender/blenkernel/intern/vfont.c b/source/blender/blenkernel/intern/vfont.c index ddc758c6887..7293e1db5d7 100644 --- a/source/blender/blenkernel/intern/vfont.c +++ b/source/blender/blenkernel/intern/vfont.c @@ -1194,7 +1194,7 @@ static bool vfont_to_curve(Object *ob, /* pass */ } - if ((mem[j] != '\n') && ((chartransdata[j].dobreak != 0))) { + if ((mem[j] != '\n') && (chartransdata[j].dobreak != 0)) { if (mem[i] == ' ') { struct TempLineInfo *li; diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index 502d3ac6d40..9c2e88f730a 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -1646,7 +1646,7 @@ openvdb::GridBase::ConstPtr BKE_volume_grid_shallow_transform(openvdb::GridBase: const blender::float4x4 &transform) { openvdb::math::Transform::Ptr grid_transform = grid->transform().copy(); - grid_transform->postMult(openvdb::Mat4d(((float *)transform.values))); + grid_transform->postMult(openvdb::Mat4d((float *)transform.values)); /* Create a transformed grid. The underlying tree is shared. */ return grid->copyGridReplacingTransform(grid_transform); diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index a43b725b6e3..71c48ed994b 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -386,12 +386,12 @@ static void refit_kdop_hull(const BVHTree *tree, BVHNode *node, int start, int e /* for all Axes. */ for (axis_iter = tree->start_axis; axis_iter < tree->stop_axis; axis_iter++) { newmin = node_bv[(2 * axis_iter)]; - if ((newmin < bv[(2 * axis_iter)])) { + if (newmin < bv[(2 * axis_iter)]) { bv[(2 * axis_iter)] = newmin; } newmax = node_bv[(2 * axis_iter) + 1]; - if ((newmax > bv[(2 * axis_iter) + 1])) { + if (newmax > bv[(2 * axis_iter) + 1]) { bv[(2 * axis_iter) + 1] = newmax; } } diff --git a/source/blender/blenlib/intern/math_color.c b/source/blender/blenlib/intern/math_color.c index bdcf52ec521..9058ef43604 100644 --- a/source/blender/blenlib/intern/math_color.c +++ b/source/blender/blenlib/intern/math_color.c @@ -368,9 +368,9 @@ unsigned int rgb_to_cpack(float r, float g, float b) void cpack_to_rgb(unsigned int col, float *r_r, float *r_g, float *r_b) { - *r_r = ((float)(((col)) & 0xFF)) * (1.0f / 255.0f); - *r_g = ((float)(((col) >> 8) & 0xFF)) * (1.0f / 255.0f); - *r_b = ((float)(((col) >> 16) & 0xFF)) * (1.0f / 255.0f); + *r_r = ((float)(col & 0xFF)) * (1.0f / 255.0f); + *r_g = ((float)((col >> 8) & 0xFF)) * (1.0f / 255.0f); + *r_b = ((float)((col >> 16) & 0xFF)) * (1.0f / 255.0f); } void rgb_uchar_to_float(float r_col[3], const unsigned char col_ub[3]) diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 773aac95193..03f9b6441be 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -527,7 +527,7 @@ float dist_signed_squared_to_corner_v3v3v3(const float p[3], cross_v3_v3v3(axis, dir_a, dir_b); - if ((len_squared_v3(axis) < FLT_EPSILON)) { + if (len_squared_v3(axis) < FLT_EPSILON) { copy_v3_v3(axis, axis_ref); } else if (dot_v3v3(axis, axis_ref) < 0.0f) { @@ -2208,7 +2208,7 @@ bool isect_planes_v3_fn( int i_test; for (i_test = 0; i_test < planes_len; i_test++) { const float *np_test = planes[i_test]; - if (((dot_v3v3(np_test, co_test) + np_test[3]) > eps_isect)) { + if ((dot_v3v3(np_test, co_test) + np_test[3]) > eps_isect) { /* For low epsilon values the point could intersect its own plane. */ if (!ELEM(i_test, i, j, k)) { break; diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c index ae068e3fb19..3f072c153ad 100644 --- a/source/blender/blenlib/intern/math_rotation.c +++ b/source/blender/blenlib/intern/math_rotation.c @@ -2178,8 +2178,8 @@ void quat_apply_track(float quat[4], short axis, short upflag) * up axis is used X->Y, Y->X, Z->X, if this first up axis isn't used then rotate 90d * the strange bit shift below just find the low axis {X:Y, Y:X, Z:X} */ if (upflag != (2 - axis) >> 1) { - float q[4] = {sqrt_1_2, 0.0, 0.0, 0.0}; /* assign 90d rotation axis */ - q[axis + 1] = ((axis == 1)) ? sqrt_1_2 : -sqrt_1_2; /* flip non Y axis */ + float q[4] = {sqrt_1_2, 0.0, 0.0, 0.0}; /* assign 90d rotation axis */ + q[axis + 1] = (axis == 1) ? sqrt_1_2 : -sqrt_1_2; /* flip non Y axis */ mul_qt_qtqt(quat, quat, q); } } diff --git a/source/blender/blenlib/intern/task_iterator.c b/source/blender/blenlib/intern/task_iterator.c index d5afbb2b117..99e966de975 100644 --- a/source/blender/blenlib/intern/task_iterator.c +++ b/source/blender/blenlib/intern/task_iterator.c @@ -26,10 +26,10 @@ * \{ */ /* Allows to avoid using malloc for userdata_chunk in tasks, when small enough. */ -#define MALLOCA(_size) ((_size) <= 8192) ? alloca((_size)) : MEM_mallocN((_size), __func__) +#define MALLOCA(_size) ((_size) <= 8192) ? alloca(_size) : MEM_mallocN((_size), __func__) #define MALLOCA_FREE(_mem, _size) \ if (((_mem) != NULL) && ((_size) > 8192)) { \ - MEM_freeN((_mem)); \ + MEM_freeN(_mem); \ } \ ((void)0) diff --git a/source/blender/blenlib/tests/BLI_array_store_test.cc b/source/blender/blenlib/tests/BLI_array_store_test.cc index 5d05e3be1f3..8e95557466e 100644 --- a/source/blender/blenlib/tests/BLI_array_store_test.cc +++ b/source/blender/blenlib/tests/BLI_array_store_test.cc @@ -607,7 +607,7 @@ static void testbuffer_list_state_random_data(ListBase *lb, MUTATE_TOTAL, }; - switch ((BLI_rng_get_uint(rng) % MUTATE_TOTAL)) { + switch (BLI_rng_get_uint(rng) % MUTATE_TOTAL) { case MUTATE_NOP: { break; } diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 8b56e08c22b..13619d8e235 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -192,7 +192,7 @@ BMFace *BM_face_split(BMesh *bm, BLI_assert(!BM_loop_is_adjacent(l_a, l_b)); /* could be an assert */ - if (UNLIKELY(BM_loop_is_adjacent(l_a, l_b)) || UNLIKELY((f != l_a->f || f != l_b->f))) { + if (UNLIKELY(BM_loop_is_adjacent(l_a, l_b)) || UNLIKELY(f != l_a->f || f != l_b->f)) { if (r_l) { *r_l = NULL; } diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c index 8bc16324971..643b5750d76 100644 --- a/source/blender/bmesh/intern/bmesh_query.c +++ b/source/blender/bmesh/intern/bmesh_query.c @@ -580,7 +580,7 @@ bool BM_vert_is_edge_pair_manifold(const BMVert *v) const BMEdge *e = v->e; if (e) { BMEdge *e_other = BM_DISK_EDGE_NEXT(e, v); - if (((e_other != e) && (BM_DISK_EDGE_NEXT(e_other, v) == e))) { + if ((e_other != e) && (BM_DISK_EDGE_NEXT(e_other, v) == e)) { return BM_edge_is_manifold(e) && BM_edge_is_manifold(e_other); } } diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index bd12287e63e..ef9892669ed 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -1062,7 +1062,7 @@ static void *bmw_EdgeLoopWalker_step(BMWalker *walker) l = NULL; break; } - } while ((++i != i_opposite)); + } while (++i != i_opposite); } else { l = NULL; diff --git a/source/blender/bmesh/operators/bmo_bridge.c b/source/blender/bmesh/operators/bmo_bridge.c index 1a2c52a321f..8240fbc53c1 100644 --- a/source/blender/bmesh/operators/bmo_bridge.c +++ b/source/blender/bmesh/operators/bmo_bridge.c @@ -147,7 +147,7 @@ static void bridge_loop_pair(BMesh *bm, } if (use_merge) { - BLI_assert((el_store_a_len == el_store_b_len)); + BLI_assert(el_store_a_len == el_store_b_len); } if (el_store_a_len != el_store_b_len) { diff --git a/source/blender/bmesh/operators/bmo_fill_edgeloop.c b/source/blender/bmesh/operators/bmo_fill_edgeloop.c index 86d204ea6a7..56aecf5e5b2 100644 --- a/source/blender/bmesh/operators/bmo_fill_edgeloop.c +++ b/source/blender/bmesh/operators/bmo_fill_edgeloop.c @@ -114,7 +114,7 @@ void bmo_edgeloop_fill_exec(BMesh *bm, BMOperator *op) v = BM_edge_other_vert(e_next, v); e_prev = e_next; i++; - } while ((v != f_verts[0])); + } while (v != f_verts[0]); if (!BM_face_exists(f_verts, i)) { BMFace *f; diff --git a/source/blender/bmesh/operators/bmo_rotate_edges.c b/source/blender/bmesh/operators/bmo_rotate_edges.c index 50d7014efcd..53efd47ec9a 100644 --- a/source/blender/bmesh/operators/bmo_rotate_edges.c +++ b/source/blender/bmesh/operators/bmo_rotate_edges.c @@ -66,7 +66,7 @@ static float bm_edge_rotate_is_boundary(const BMEdge *e) do { BMEdge *e_iter = l_iter->e; const int e_iter_index = BM_elem_index_get(e_iter); - if ((e_iter_index != -1)) { + if (e_iter_index != -1) { if (count == 1) { return false; } diff --git a/source/blender/bmesh/operators/bmo_smooth_laplacian.c b/source/blender/bmesh/operators/bmo_smooth_laplacian.c index 08efe5383a8..575a88331da 100644 --- a/source/blender/bmesh/operators/bmo_smooth_laplacian.c +++ b/source/blender/bmesh/operators/bmo_smooth_laplacian.c @@ -223,7 +223,7 @@ static void init_laplacian_matrix(LaplacianSystem *sys) sys->vweights[vi_prev] += w1 + w2; sys->vweights[vi_curr] += w2 + w3; sys->vweights[vi_next] += w1 + w3; - } while (((void)(l_curr_index += 1), (l_iter = l_iter->next) != l_first)); + } while ((void)(l_curr_index += 1), (l_iter = l_iter->next) != l_first); } } @@ -293,7 +293,7 @@ static void fill_laplacian_matrix(LaplacianSystem *sys) ok_prev = ok_curr; ok_curr = ok_next; - } while (((void)(l_curr_index += 1), (l_iter = l_iter->next) != l_first)); + } while ((void)(l_curr_index += 1), (l_iter = l_iter->next) != l_first); } BM_ITER_MESH_INDEX (e, &eiter, sys->bm, BM_EDGES_OF_MESH, i) { if (BM_elem_flag_test(e, BM_ELEM_SELECT) || !BM_edge_is_boundary(e)) { diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c index 3d7bacf7080..873b47a7080 100644 --- a/source/blender/bmesh/tools/bmesh_bisect_plane.c +++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c @@ -170,7 +170,7 @@ static void bm_face_bisect_verts( BLI_assert(BM_VERT_DIR(l_iter->v) == 0); /* If both are -1 or 1, or both are zero: don't flip 'inside' var while walking. */ - BM_VERT_SKIP(l_iter->v) = (((BM_VERT_DIR(l_iter->prev->v) ^ BM_VERT_DIR(l_iter->next->v))) == + BM_VERT_SKIP(l_iter->v) = ((BM_VERT_DIR(l_iter->prev->v) ^ BM_VERT_DIR(l_iter->next->v)) == 0); STACK_PUSH(vert_split_arr, l_iter->v); diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index 81a392d38a5..62f472b5146 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -304,7 +304,7 @@ static void bm_decim_build_edge_cost_single(BMEdge *e, const float e_weight = 2.0f - (vweights[BM_elem_index_get(e->v1)] + vweights[BM_elem_index_get(e->v2)]); if (e_weight) { - cost += (BM_edge_calc_length(e) * ((e_weight * vweight_factor))); + cost += (BM_edge_calc_length(e) * (e_weight * vweight_factor)); } } diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c index 41c995a52bf..e209918d6e3 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c +++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c @@ -330,7 +330,7 @@ void BM_mesh_decimate_dissolve_ex(BMesh *bm, } while ((BLI_heap_is_empty(eheap) == false) && - (BLI_heap_node_value((enode_top = BLI_heap_top(eheap))) < angle_limit_cos_neg)) { + (BLI_heap_node_value(enode_top = BLI_heap_top(eheap)) < angle_limit_cos_neg)) { BMFace *f_new = NULL; BMEdge *e; diff --git a/source/blender/bmesh/tools/bmesh_edgesplit.c b/source/blender/bmesh/tools/bmesh_edgesplit.c index a703b5338ef..03ff6b39d0e 100644 --- a/source/blender/bmesh/tools/bmesh_edgesplit.c +++ b/source/blender/bmesh/tools/bmesh_edgesplit.c @@ -51,8 +51,8 @@ void BM_mesh_edgesplit(BMesh *bm, */ BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_TAG)) { - if (UNLIKELY(((BM_elem_flag_test(e->v1, BM_ELEM_TAG) == false) && - (BM_elem_flag_test(e->v2, BM_ELEM_TAG) == false)))) { + if (UNLIKELY((BM_elem_flag_test(e->v1, BM_ELEM_TAG) == false) && + (BM_elem_flag_test(e->v2, BM_ELEM_TAG) == false))) { BM_elem_flag_enable(e->v1, BM_ELEM_TAG); BM_elem_flag_enable(e->v2, BM_ELEM_TAG); } diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc index 49669d70177..4a589d45275 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc @@ -73,7 +73,7 @@ void GaussianAlphaXBlurOperation::execute_pixel(float output[4], int x, int y, v /* *** this is the main part which is different to 'GaussianXBlurOperation' *** */ int step = get_step(); - int bufferindex = ((xmin - bufferstartx)) + ((ymin - bufferstarty) * bufferwidth); + int bufferindex = (xmin - bufferstartx) + ((ymin - bufferstarty) * bufferwidth); /* gauss */ float alpha_accum = 0.0f; diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc index 0e73299f58e..e9ff756093c 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc @@ -86,7 +86,7 @@ void GaussianAlphaYBlurOperation::execute_pixel(float output[4], int x, int y, v float distfacinv_max = 1.0f; /* 0 to 1 */ for (int ny = ymin; ny < ymax; ny += step) { - int bufferindex = ((xmin - bufferstartx)) + ((ny - bufferstarty) * bufferwidth); + int bufferindex = (xmin - bufferstartx) + ((ny - bufferstarty) * bufferwidth); const int index = (ny - y) + filtersize_; float value = finv_test(buffer[bufferindex], do_invert); diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cc b/source/blender/compositor/operations/COM_VectorBlurOperation.cc index 8add3924033..75d6bba713d 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cc +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cc @@ -760,7 +760,7 @@ void zbuf_accumulate_vecblur(NodeBlurData *nbd, dm = rectmove; dvec1 = vecbufrect; for (x = xsize * ysize; x > 0; x--, dm++, dvec1 += 4) { - if ((dvec1[0] != 0.0f || dvec1[1] != 0.0f || dvec1[2] != 0.0f || dvec1[3] != 0.0f)) { + if (dvec1[0] != 0.0f || dvec1[1] != 0.0f || dvec1[2] != 0.0f || dvec1[3] != 0.0f) { *dm = 255; } } diff --git a/source/blender/datatoc/datatoc_icon.c b/source/blender/datatoc/datatoc_icon.c index 780dea34b93..fd892ac2f31 100644 --- a/source/blender/datatoc/datatoc_icon.c +++ b/source/blender/datatoc/datatoc_icon.c @@ -55,7 +55,7 @@ static bool path_test_extension(const char *str, const char *ext) static void endian_switch_uint32(uint *val) { uint tval = *val; - *val = ((tval >> 24)) | ((tval << 8) & 0x00ff0000) | ((tval >> 8) & 0x0000ff00) | ((tval << 24)); + *val = (tval >> 24) | ((tval << 8) & 0x00ff0000) | ((tval >> 8) & 0x0000ff00) | (tval << 24); } static const char *path_slash_rfind(const char *string) diff --git a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc index 33978518ffc..21d1948f03c 100644 --- a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc +++ b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc @@ -173,7 +173,7 @@ PassMain::Sub *ForwardPipeline::prepass_transparent_add(const Object *ob, return nullptr; } DRWState state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL; - if ((blender_mat->blend_flag & MA_BL_CULL_BACKFACE)) { + if (blender_mat->blend_flag & MA_BL_CULL_BACKFACE) { state |= DRW_STATE_CULL_BACK; } float sorting_value = math::dot(float3(ob->obmat[3]), camera_forward_); @@ -188,7 +188,7 @@ PassMain::Sub *ForwardPipeline::material_transparent_add(const Object *ob, GPUMaterial *gpumat) { DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_CUSTOM | DRW_STATE_DEPTH_LESS_EQUAL; - if ((blender_mat->blend_flag & MA_BL_CULL_BACKFACE)) { + if (blender_mat->blend_flag & MA_BL_CULL_BACKFACE) { state |= DRW_STATE_CULL_BACK; } float sorting_value = math::dot(float3(ob->obmat[3]), camera_forward_); diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c index ec44fdf42d5..a41918e7e0d 100644 --- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c @@ -49,7 +49,7 @@ GPENCIL_tObject *gpencil_object_cache_add(GPENCIL_PrivateData *pd, Object *ob) for (int i = 0; i < tot_materials; i++) { MaterialGPencilStyle *gp_style = BKE_gpencil_material_settings(ob, i + 1); if (((gp_style != NULL) && (gp_style->flag & GP_MATERIAL_IS_STROKE_HOLDOUT)) || - ((gp_style->flag & GP_MATERIAL_IS_FILL_HOLDOUT))) { + (gp_style->flag & GP_MATERIAL_IS_FILL_HOLDOUT)) { tgp_ob->do_mat_holdout = true; break; } diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c index 7eb3569219d..a7d8570dbaa 100644 --- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c +++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c @@ -98,7 +98,7 @@ static void gpencil_vfx_blur(BlurShaderFxData *fx, Object *ob, gpIterVfxData *it DRW_view_persmat_get(NULL, persmat, false); const float w = fabsf(mul_project_m4_v3_zfac(persmat, ob->obmat[3])); - if ((fx->flag & FX_BLUR_DOF_MODE)) { + if (fx->flag & FX_BLUR_DOF_MODE) { /* Compute circle of confusion size. */ float coc = (iter->pd->dof_params[0] / -w) - iter->pd->dof_params[1]; copy_v2_fl(blur_size, fabsf(coc)); diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c index f7f156e5297..3ea0805b8f1 100644 --- a/source/blender/draw/engines/workbench/workbench_data.c +++ b/source/blender/draw/engines/workbench/workbench_data.c @@ -173,7 +173,7 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd) if (!v3d || (v3d->shading.type == OB_RENDER && BKE_scene_uses_blender_workbench(scene))) { short shading_flag = scene->display.shading.flag; - if (XRAY_FLAG_ENABLED((&scene->display))) { + if (XRAY_FLAG_ENABLED(&scene->display)) { /* Disable shading options that aren't supported in transparency mode. */ shading_flag &= ~(V3D_SHADING_SHADOW | V3D_SHADING_CAVITY | V3D_SHADING_DEPTH_OF_FIELD); } @@ -187,8 +187,8 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd) wpd->shading = scene->display.shading; wpd->shading.flag = shading_flag; - if (XRAY_FLAG_ENABLED((&scene->display))) { - wpd->shading.xray_alpha = XRAY_ALPHA((&scene->display)); + if (XRAY_FLAG_ENABLED(&scene->display)) { + wpd->shading.xray_alpha = XRAY_ALPHA(&scene->display); } else { wpd->shading.xray_alpha = 1.0f; diff --git a/source/blender/draw/intern/draw_cache_impl_lattice.c b/source/blender/draw/intern/draw_cache_impl_lattice.c index 0f12e78d60e..aa470b86869 100644 --- a/source/blender/draw/intern/draw_cache_impl_lattice.c +++ b/source/blender/draw/intern/draw_cache_impl_lattice.c @@ -231,7 +231,7 @@ static bool lattice_batch_cache_valid(Lattice *lt) if ((cache->dims.u_len != lt->pntsu) || (cache->dims.v_len != lt->pntsv) || (cache->dims.w_len != lt->pntsw) || - ((cache->show_only_outside != ((lt->flag & LT_OUTSIDE) != 0)))) { + (cache->show_only_outside != ((lt->flag & LT_OUTSIDE) != 0))) { return false; } diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 8edeea49cbb..58bcf0efea8 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -85,7 +85,7 @@ #define ANIM_CHAN_NAME_SIZE 256 /* get the pointer used for some flag */ -#define GET_ACF_FLAG_PTR(ptr, type) ((*(type) = sizeof((ptr))), &(ptr)) +#define GET_ACF_FLAG_PTR(ptr, type) ((*(type) = sizeof(ptr)), &(ptr)) /* *********************************************** */ /* Generic Functions (Type independent) */ diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c index 600abaf3737..4b78b122764 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c @@ -83,8 +83,8 @@ static bool gizmo_calc_rect_view_margin(const wmGizmo *gz, const float dims[2], return false; } - margin[0] = ((handle_size * scale_xy[0])); - margin[1] = ((handle_size * scale_xy[1])); + margin[0] = (handle_size * scale_xy[0]); + margin[1] = (handle_size * scale_xy[1]); return true; } diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c index 0a5ec3330c2..8e4b4519ff8 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c @@ -81,9 +81,9 @@ static void gizmo_calc_rect_view_margin(const wmGizmo *gz, const float dims[3], float scale_xyz[3]; gizmo_calc_rect_view_scale(gz, dims, scale_xyz); - margin[0] = ((handle_size * scale_xyz[0])); - margin[1] = ((handle_size * scale_xyz[1])); - margin[2] = ((handle_size * scale_xyz[2])); + margin[0] = (handle_size * scale_xyz[0]); + margin[1] = (handle_size * scale_xyz[1]); + margin[2] = (handle_size * scale_xyz[2]); } /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c index 9b7b157dc7e..d7ae9be6c33 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c @@ -106,9 +106,9 @@ static void dial_geom_draw(const float color[4], UNUSED_VARS(gz, axis_modal_mat, clip_plane); wm_gizmo_geometryinfo_draw(&wm_gizmo_geom_data_dial, select, color); #else - const bool filled = ((draw_options & (select ? (ED_GIZMO_DIAL_DRAW_FLAG_FILL | - ED_GIZMO_DIAL_DRAW_FLAG_FILL_SELECT) : - ED_GIZMO_DIAL_DRAW_FLAG_FILL))); + const bool filled = (draw_options & (select ? (ED_GIZMO_DIAL_DRAW_FLAG_FILL | + ED_GIZMO_DIAL_DRAW_FLAG_FILL_SELECT) : + ED_GIZMO_DIAL_DRAW_FLAG_FILL)); GPUVertFormat *format = immVertexFormat(); /* NOTE(Metal): Prefer using 3D coordinates with 3D shader, even if rendering 2D gizmo's. */ diff --git a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c index af1f09d7e25..f6ae02dd010 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c @@ -93,9 +93,9 @@ static void move_geom_draw(const wmGizmo *gz, #else const int draw_style = RNA_enum_get(gz->ptr, "draw_style"); const bool filled = (draw_style != ED_GIZMO_MOVE_STYLE_CROSS_2D) && - ((draw_options & (select ? (ED_GIZMO_MOVE_DRAW_FLAG_FILL | - ED_GIZMO_MOVE_DRAW_FLAG_FILL_SELECT) : - ED_GIZMO_MOVE_DRAW_FLAG_FILL))); + (draw_options & (select ? (ED_GIZMO_MOVE_DRAW_FLAG_FILL | + ED_GIZMO_MOVE_DRAW_FLAG_FILL_SELECT) : + ED_GIZMO_MOVE_DRAW_FLAG_FILL)); GPUVertFormat *format = immVertexFormat(); /* NOTE(Metal): Prefer using 3D coordinates with 3D shader, even if rendering 2D gizmo's. */ diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 7446c727a0c..37acd7540cf 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1743,14 +1743,14 @@ static void gpencil_stroke_eraser_dostroke(tGPsdata *p, /* 2) Tag any point with overly low influence for removal in the next pass */ if ((inf1 > 0.0f) && - (((pt1->pressure < cull_thresh) || (p->flags & GP_PAINTFLAG_HARD_ERASER) || - (eraser->gpencil_settings->eraser_mode == GP_BRUSH_ERASER_HARD)))) { + ((pt1->pressure < cull_thresh) || (p->flags & GP_PAINTFLAG_HARD_ERASER) || + (eraser->gpencil_settings->eraser_mode == GP_BRUSH_ERASER_HARD))) { pt1->flag |= GP_SPOINT_TAG; do_cull = true; } if ((inf1 > 2.0f) && - (((pt2->pressure < cull_thresh) || (p->flags & GP_PAINTFLAG_HARD_ERASER) || - (eraser->gpencil_settings->eraser_mode == GP_BRUSH_ERASER_HARD)))) { + ((pt2->pressure < cull_thresh) || (p->flags & GP_PAINTFLAG_HARD_ERASER) || + (eraser->gpencil_settings->eraser_mode == GP_BRUSH_ERASER_HARD))) { pt2->flag |= GP_SPOINT_TAG; do_cull = true; } diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index 4a4fffc9638..0c8af215e9f 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -677,8 +677,8 @@ static void gpencil_primitive_circle(tGPDprimitive *tgpi, tGPspoint *points2D) center[0] = tgpi->start[0] + ((tgpi->end[0] - tgpi->start[0]) / 2.0f); center[1] = tgpi->start[1] + ((tgpi->end[1] - tgpi->start[1]) / 2.0f); - radius[0] = fabsf(((tgpi->end[0] - tgpi->start[0]) / 2.0f)); - radius[1] = fabsf(((tgpi->end[1] - tgpi->start[1]) / 2.0f)); + radius[0] = fabsf((tgpi->end[0] - tgpi->start[0]) / 2.0f); + radius[1] = fabsf((tgpi->end[1] - tgpi->start[1]) / 2.0f); for (int i = tgpi->tot_stored_edges; i < totpoints; i++) { tGPspoint *p2d = &points2D[i]; diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 729e8412684..c972d7c680f 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -770,7 +770,7 @@ void gpencil_point_3d_to_xy(const GP_SpaceConversion *gsc, float xyval[2]; /* sanity checks */ - BLI_assert((gsc->area->spacetype == SPACE_VIEW3D)); + BLI_assert(gsc->area->spacetype == SPACE_VIEW3D); if (flag & GP_STROKE_3DSPACE) { if (ED_view3d_project_float_global(region, pt, xyval, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) { diff --git a/source/blender/editors/gpencil/gpencil_weight_paint.c b/source/blender/editors/gpencil/gpencil_weight_paint.c index 22fbf0021fc..fbfea067eca 100644 --- a/source/blender/editors/gpencil/gpencil_weight_paint.c +++ b/source/blender/editors/gpencil/gpencil_weight_paint.c @@ -235,7 +235,7 @@ static bool brush_draw_apply(tGP_BrushWeightpaintData *gso, if (gso->vrgroup == -1) { if (gso->object) { Object *ob_armature = BKE_modifiers_is_deformed_by_armature(gso->object); - if ((ob_armature != NULL)) { + if (ob_armature != NULL) { Bone *actbone = ((bArmature *)ob_armature->data)->act_bone; if (actbone != NULL) { bPoseChannel *pchan = BKE_pose_channel_find_name(ob_armature->pose, actbone->name); diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index ea1770db6f5..a6c700bdc2f 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6152,7 +6152,7 @@ static bool ui_numedit_but_UNITVEC( * do this in "angle" space - this gives increments of same size */ for (int i = 0; i < 3; i++) { angle = asinf(fp[i]); - angle_snap = roundf((angle / snap_steps_angle)) * snap_steps_angle; + angle_snap = roundf(angle / snap_steps_angle) * snap_steps_angle; fp[i] = sinf(angle_snap); } normalize_v3(fp); diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index ad2c08194aa..5d71e828d05 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -1956,7 +1956,7 @@ static void ui_id_preview_image_render_size( const bContext *C, Scene *scene, ID *id, PreviewImage *pi, int size, const bool use_job) { /* changed only ever set by dynamic icons */ - if (((pi->flag[size] & PRV_CHANGED) || !pi->rect[size])) { + if ((pi->flag[size] & PRV_CHANGED) || !pi->rect[size]) { /* create the rect if necessary */ icon_set_image(C, scene, id, pi, size, use_job); diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 842201894a3..1b13632b131 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1371,7 +1371,7 @@ static void widget_draw_icon( alpha = 0.75f; } } - else if ((but->type == UI_BTYPE_LABEL)) { + else if (but->type == UI_BTYPE_LABEL) { /* extra feature allows more alpha blending */ if (but->a1 == 1.0f) { alpha *= but->a2; @@ -1422,7 +1422,7 @@ static void widget_draw_icon( if (ui_but_drag_is_draggable(but) && (but->flag & UI_ACTIVE)) { UI_icon_draw_ex(xs, ys, icon, aspect, 1.25f, 0.0f, color, has_theme); } - else if ((but->flag & (UI_ACTIVE | UI_SELECT | UI_SELECT_DRAW))) { + else if (but->flag & (UI_ACTIVE | UI_SELECT | UI_SELECT_DRAW)) { UI_icon_draw_ex(xs, ys, icon, aspect, alpha, 0.0f, color, has_theme); } else if (!((but->icon != ICON_NONE) && UI_but_is_tool(but))) { diff --git a/source/blender/editors/mesh/editmesh_extrude_spin.c b/source/blender/editors/mesh/editmesh_extrude_spin.c index 9e2b7aa7f4d..1b9c98db5eb 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin.c +++ b/source/blender/editors/mesh/editmesh_extrude_spin.c @@ -48,7 +48,7 @@ static int edbm_spin_exec(bContext *C, wmOperator *op) const bool use_normal_flip = RNA_boolean_get(op->ptr, "use_normal_flip"); const bool dupli = RNA_boolean_get(op->ptr, "dupli"); const bool use_auto_merge = (RNA_boolean_get(op->ptr, "use_auto_merge") && (dupli == false) && - (steps >= 3) && fabsf((fabsf(angle) - (float)(M_PI * 2))) <= 1e-6f); + (steps >= 3) && fabsf(fabsf(angle) - (float)(M_PI * 2)) <= 1e-6f); if (is_zero_v3(axis)) { BKE_report(op->reports, RPT_ERROR, "Invalid/unset axis"); diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index d364aa2274f..8130b0ac83d 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -1220,7 +1220,7 @@ static void knife_bvh_init(KnifeTool_OpData *kcd) /* Test Function. */ bool (*test_fn)(BMFace *); - if ((kcd->only_select && kcd->cut_through)) { + if (kcd->only_select && kcd->cut_through) { test_fn = knife_bm_face_is_select; } else { @@ -2068,7 +2068,7 @@ static bool knife_add_single_cut__is_linehit_outside_face(BMFace *f, return true; } } - else if ((lh->kfe && lh->kfe->e)) { + else if (lh->kfe && lh->kfe->e) { BMLoop *l; /* side-of-edge */ if ((l = BM_face_edge_share_loop(f, lh->kfe->e)) && (BM_loop_point_side_of_edge_test(l, co) < 0.0f)) { diff --git a/source/blender/editors/mesh/editmesh_polybuild.c b/source/blender/editors/mesh/editmesh_polybuild.c index 17580dbe7d1..06565fbf314 100644 --- a/source/blender/editors/mesh/editmesh_polybuild.c +++ b/source/blender/editors/mesh/editmesh_polybuild.c @@ -77,7 +77,7 @@ static void edbm_flag_disable_all_multi(const Scene *scene, static bool edbm_preselect_or_active(bContext *C, const View3D *v3d, Base **r_base, BMElem **r_ele) { ARegion *region = CTX_wm_region(C); - const bool show_gizmo = !((v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_TOOL))); + const bool show_gizmo = !(v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_TOOL)); wmGizmoMap *gzmap = show_gizmo ? region->gizmo_map : NULL; wmGizmoGroup *gzgroup = gzmap ? WM_gizmomap_group_find(gzmap, "VIEW3D_GGT_mesh_preselect_elem") : diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index b66fe84e84e..34f7301c4b1 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -3226,7 +3226,7 @@ static void select_linked_delimit_begin(BMesh *bm, int delimit) BMEdge *e; BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) { - const bool is_walk_ok = ((select_linked_delimit_test(e, delimit, &delimit_data) == false)); + const bool is_walk_ok = (select_linked_delimit_test(e, delimit, &delimit_data) == false); BMO_edge_flag_set(bm, e, BMO_ELE_TAG, is_walk_ok); } diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 3c3b66b4b1d..fa9ded0f989 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -114,7 +114,7 @@ ListBase *ED_object_constraint_list_from_constraint(Object *ob, } /* try object constraints first */ - if ((BLI_findindex(&ob->constraints, con) != -1)) { + if (BLI_findindex(&ob->constraints, con) != -1) { return &ob->constraints; } @@ -126,7 +126,7 @@ ListBase *ED_object_constraint_list_from_constraint(Object *ob, * NOTE: it's not possible to directly look up the active bone yet, so this will have to do */ for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { - if ((BLI_findindex(&pchan->constraints, con) != -1)) { + if (BLI_findindex(&pchan->constraints, con) != -1) { if (r_pchan) { *r_pchan = pchan; diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index c3482b13db6..2e22e3bb00d 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1490,7 +1490,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op) ViewLayer *view_layer = CTX_data_view_layer(C); BKE_view_layer_synced_ensure(scene, view_layer); Object *obact = BKE_view_layer_active_object_get(view_layer); - if (obact && ((obact->mode & OB_MODE_ALL_PAINT))) { + if (obact && (obact->mode & OB_MODE_ALL_PAINT)) { ctx_ob_single_active.ptr.data = obact; BLI_addtail(&ctx_objects, &ctx_ob_single_active); } diff --git a/source/blender/editors/object/object_vgroup.cc b/source/blender/editors/object/object_vgroup.cc index 44fea0b32f0..0e671257972 100644 --- a/source/blender/editors/object/object_vgroup.cc +++ b/source/blender/editors/object/object_vgroup.cc @@ -2789,7 +2789,7 @@ static bool vertex_group_vert_poll_ex(bContext *C, return false; } - if (ob_type_flag && (((1 << ob->type) & ob_type_flag)) == 0) { + if (ob_type_flag && ((1 << ob->type) & ob_type_flag) == 0) { return false; } diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c index 07a93d3907a..f19017cb723 100644 --- a/source/blender/editors/scene/scene_edit.c +++ b/source/blender/editors/scene/scene_edit.c @@ -333,7 +333,7 @@ static const EnumPropertyItem *scene_new_sequencer_enum_itemf(bContext *C, else { Scene *scene = CTX_data_scene(C); Sequence *seq = SEQ_select_active_get(scene); - if ((seq && (seq->type == SEQ_TYPE_SCENE) && (seq->scene != NULL))) { + if (seq && (seq->type == SEQ_TYPE_SCENE) && (seq->scene != NULL)) { has_scene_or_no_context = true; } } diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 29f78b2a0ef..c24850fdad5 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1584,28 +1584,28 @@ static void area_move_set_limits(wmWindow *win, /* logic here is only tested for lower edge :) */ /* left edge */ - if ((area->v1->editflag && area->v2->editflag)) { + if (area->v1->editflag && area->v2->editflag) { *smaller = area->v4->vec.x - size_max; *bigger = area->v4->vec.x - size_min; *use_bigger_smaller_snap = true; return; } /* top edge */ - if ((area->v2->editflag && area->v3->editflag)) { + if (area->v2->editflag && area->v3->editflag) { *smaller = area->v1->vec.y + size_min; *bigger = area->v1->vec.y + size_max; *use_bigger_smaller_snap = true; return; } /* right edge */ - if ((area->v3->editflag && area->v4->editflag)) { + if (area->v3->editflag && area->v4->editflag) { *smaller = area->v1->vec.x + size_min; *bigger = area->v1->vec.x + size_max; *use_bigger_smaller_snap = true; return; } /* lower edge */ - if ((area->v4->editflag && area->v1->editflag)) { + if (area->v4->editflag && area->v1->editflag) { *smaller = area->v2->vec.y - size_max; *bigger = area->v2->vec.y - size_min; *use_bigger_smaller_snap = true; diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c index 5df65e596b9..79316361e53 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -150,7 +150,7 @@ static void brush_painter_2d_require_imbuf( { BrushPainterCache *cache = &tile->cache; - if ((cache->use_float != use_float)) { + if (cache->use_float != use_float) { if (cache->ibuf) { IMB_freeImBuf(cache->ibuf); } @@ -1178,8 +1178,8 @@ static ImBuf *paint_2d_lift_clone(ImBuf *ibuf, ImBuf *ibufb, const int *pos) static void paint_2d_convert_brushco(ImBuf *ibufb, const float pos[2], int ipos[2]) { - ipos[0] = (int)floorf((pos[0] - ibufb->x / 2)); - ipos[1] = (int)floorf((pos[1] - ibufb->y / 2)); + ipos[0] = (int)floorf(pos[0] - ibufb->x / 2); + ipos[1] = (int)floorf(pos[1] - ibufb->y / 2); } static void paint_2d_do_making_brush(ImagePaintState *s, diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc index 9abc3c5112e..c6eefb0b50e 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex.cc @@ -2459,7 +2459,7 @@ static void wpaint_do_symmetrical_brush_actions( /* symm is a bit combination of XYZ - 1 is mirror * X; 2 is Y; 3 is XY; 4 is Z; 5 is XZ; 6 is YZ; 7 is XYZ */ for (i = 1; i <= symm; i++) { - if ((symm & i && (symm != 5 || i != 3) && (symm != 6 || (!ELEM(i, 3, 5))))) { + if (symm & i && (symm != 5 || i != 3) && (symm != 6 || (!ELEM(i, 3, 5)))) { cache->mirror_symmetry_pass = i; cache->radial_symmetry_pass = 0; SCULPT_cache_calc_brushdata_symm(cache, i, 0, 0); diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc index a284d1608cb..707de6755b3 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc @@ -73,8 +73,7 @@ static bool vertex_paint_from_weight(Object *ob) using namespace blender; Mesh *me; - if (((me = BKE_mesh_from_object(ob)) == nullptr || - (ED_mesh_color_ensure(me, nullptr)) == false)) { + if ((me = BKE_mesh_from_object(ob)) == nullptr || (ED_mesh_color_ensure(me, nullptr)) == false) { return false; } diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c index ac16631f115..22346434ed5 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c @@ -203,7 +203,7 @@ BLI_INLINE float wval_screen(float weight, float paintval, float fac) return weight; } mfac = 1.0f - fac; - temp = max_ff(1.0f - (((1.0f - weight) * (1.0f - paintval))), 0); + temp = max_ff(1.0f - ((1.0f - weight) * (1.0f - paintval)), 0); return mfac * weight + temp * fac; } BLI_INLINE float wval_hardlight(float weight, float paintval, float fac) diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 688573d78a6..eb4cc9fd866 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -3029,7 +3029,7 @@ void SCULPT_calc_brush_plane( int SCULPT_plane_trim(const StrokeCache *cache, const Brush *brush, const float val[3]) { return (!(brush->flag & BRUSH_PLANE_TRIM) || - ((dot_v3v3(val, val) <= cache->radius_squared * cache->plane_trim_squared))); + (dot_v3v3(val, val) <= cache->radius_squared * cache->plane_trim_squared)); } int SCULPT_plane_point_side(const float co[3], const float plane[4]) diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 3f671fd44a1..f7fd910d6e9 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -112,10 +112,10 @@ static void clamp_to_filelist(int numfiles, FileSelection *sel) } /* clamp */ - if ((sel->first >= numfiles)) { + if (sel->first >= numfiles) { sel->first = numfiles - 1; } - if ((sel->last >= numfiles)) { + if (sel->last >= numfiles) { sel->last = numfiles - 1; } } diff --git a/source/blender/editors/space_file/filelist.cc b/source/blender/editors/space_file/filelist.cc index 20c74f04319..2f3eaf87836 100644 --- a/source/blender/editors/space_file/filelist.cc +++ b/source/blender/editors/space_file/filelist.cc @@ -987,7 +987,7 @@ void filelist_setfilter_options(FileList *filelist, filelist->filter_data.filter_glob, filter_glob, sizeof(filelist->filter_data.filter_glob)); update = true; } - if ((BLI_strcmp_ignore_pad(filelist->filter_data.filter_search, filter_search, '*') != 0)) { + if (BLI_strcmp_ignore_pad(filelist->filter_data.filter_search, filter_search, '*') != 0) { BLI_strncpy_ensure_pad(filelist->filter_data.filter_search, filter_search, '*', diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index 1434f204ee5..75c1e958e32 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -221,7 +221,7 @@ static void graph_main_region_draw(const bContext *C, ARegion *region) v2d->tot.xmax += 10.0f; } - if (((sipo->flag & SIPO_NODRAWCURSOR) == 0)) { + if ((sipo->flag & SIPO_NODRAWCURSOR) == 0) { uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT); immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR); diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index fa0fdb01bdf..c1ac5b7e7ef 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -383,7 +383,7 @@ bool ED_image_slot_cycle(struct Image *image, int direction) image->render_slot = ((cur == 1) ? 0 : 1); } - if ((cur != image->render_slot)) { + if (cur != image->render_slot) { BKE_image_partial_update_mark_full_update(image); } return (cur != image->render_slot); diff --git a/source/blender/editors/space_info/info_stats.cc b/source/blender/editors/space_info/info_stats.cc index 0aa35069c1e..fb744071a8e 100644 --- a/source/blender/editors/space_info/info_stats.cc +++ b/source/blender/editors/space_info/info_stats.cc @@ -375,7 +375,7 @@ static void stats_update(Depsgraph *depsgraph, else { /* Skip hidden objects in local view that are not in edit-mode, * an exception for edit-mode, in most other modes these would be considered hidden. */ - if ((v3d_local && !BKE_object_is_visible_in_viewport(v3d_local, ob_iter))) { + if (v3d_local && !BKE_object_is_visible_in_viewport(v3d_local, ob_iter)) { continue; } } @@ -394,7 +394,7 @@ static void stats_update(Depsgraph *depsgraph, } else { /* See comment for edit-mode. */ - if ((v3d_local && !BKE_object_is_visible_in_viewport(v3d_local, ob_iter))) { + if (v3d_local && !BKE_object_is_visible_in_viewport(v3d_local, ob_iter)) { continue; } } diff --git a/source/blender/editors/space_outliner/outliner_select.cc b/source/blender/editors/space_outliner/outliner_select.cc index 15079448317..6f8677e8370 100644 --- a/source/blender/editors/space_outliner/outliner_select.cc +++ b/source/blender/editors/space_outliner/outliner_select.cc @@ -244,8 +244,8 @@ static void do_outliner_object_select_recursive(const Scene *scene, BKE_view_layer_synced_ensure(scene, view_layer); LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) { Object *ob = base->object; - if ((((base->flag & BASE_ENABLED_AND_MAYBE_VISIBLE_IN_VIEWPORT) != 0) && - BKE_object_is_child_recursive(ob_parent, ob))) { + if (((base->flag & BASE_ENABLED_AND_MAYBE_VISIBLE_IN_VIEWPORT) != 0) && + BKE_object_is_child_recursive(ob_parent, ob)) { ED_object_base_select(base, select ? BA_SELECT : BA_DESELECT); } } diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index dd6d58ee5a2..719332046b3 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -564,7 +564,7 @@ static const EnumPropertyItem *strip_new_sequencer_enum_itemf(bContext *C, else { Scene *scene = CTX_data_scene(C); Sequence *seq = SEQ_select_active_get(scene); - if ((seq && (seq->type == SEQ_TYPE_SCENE) && (seq->scene != NULL))) { + if (seq && (seq->type == SEQ_TYPE_SCENE) && (seq->scene != NULL)) { has_scene_or_no_context = true; } } diff --git a/source/blender/editors/space_sequencer/sequencer_channels_draw.c b/source/blender/editors/space_sequencer/sequencer_channels_draw.c index 81fc87598f8..8abd7e424d1 100644 --- a/source/blender/editors/space_sequencer/sequencer_channels_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_channels_draw.c @@ -78,7 +78,7 @@ static float icon_width_get(const SeqChannelDrawContext *context) static float widget_y_offset(const SeqChannelDrawContext *context) { - return (((context->channel_height / context->scale) - icon_width_get(context))) / 2; + return ((context->channel_height / context->scale) - icon_width_get(context)) / 2; } static float channel_index_y_min(const SeqChannelDrawContext *context, const int index) diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c index af0aa093e40..a1dd9ce2ac2 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.c +++ b/source/blender/editors/space_sequencer/sequencer_scopes.c @@ -615,7 +615,7 @@ static void vectorscope_put_cross(uchar r, uchar g, uchar b, char *tgt, int w, i rgb[2] = (float)b / 255.0f; rgb_to_yuv_normalized(rgb, yuv); - p = tgt + 4 * (w * (int)((yuv[2] * (h - 3) + 1)) + (int)((yuv[1] * (w - 3) + 1))); + p = tgt + 4 * (w * (int)(yuv[2] * (h - 3) + 1) + (int)(yuv[1] * (w - 3) + 1)); if (r == 0 && g == 0 && b == 0) { r = 255; @@ -667,7 +667,7 @@ static ImBuf *make_vectorscope_view_from_ibuf_byte(ImBuf *ibuf) rgb[2] = (float)src1[2] / 255.0f; rgb_to_yuv_normalized(rgb, yuv); - p = tgt + 4 * (w * (int)((yuv[2] * (h - 3) + 1)) + (int)((yuv[1] * (w - 3) + 1))); + p = tgt + 4 * (w * (int)(yuv[2] * (h - 3) + 1) + (int)(yuv[1] * (w - 3) + 1)); scope_put_pixel(wtable, (uchar *)p); } } @@ -713,7 +713,7 @@ static ImBuf *make_vectorscope_view_from_ibuf_float(ImBuf *ibuf) rgb_to_yuv_normalized(rgb, yuv); - p = tgt + 4 * (w * (int)((yuv[2] * (h - 3) + 1)) + (int)((yuv[1] * (w - 3) + 1))); + p = tgt + 4 * (w * (int)(yuv[2] * (h - 3) + 1) + (int)(yuv[1] * (w - 3) + 1)); scope_put_pixel(wtable, (uchar *)p); } } diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 4aaa3aeb2ff..fde8bc16f6b 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -973,7 +973,7 @@ static int sequencer_select_exec(bContext *C, wmOperator *op) bool changed = false; /* Deselect everything */ - if (deselect_all || (seq && ((extend == false && deselect == false && toggle == false)))) { + if (deselect_all || (seq && (extend == false && deselect == false && toggle == false))) { ED_sequencer_deselect_all(scene); changed = true; } diff --git a/source/blender/editors/space_sequencer/sequencer_thumbnails.c b/source/blender/editors/space_sequencer/sequencer_thumbnails.c index a11b5663620..862ddc803e2 100644 --- a/source/blender/editors/space_sequencer/sequencer_thumbnails.c +++ b/source/blender/editors/space_sequencer/sequencer_thumbnails.c @@ -374,7 +374,7 @@ static int sequencer_thumbnail_closest_guaranteed_frame_get(struct Scene *scene, /* Set of "guaranteed" thumbnails. */ const int frame_index = timeline_frame - SEQ_time_left_handle_frame_get(scene, seq); const int frame_step = SEQ_render_thumbnails_guaranteed_set_frame_step_get(scene, seq); - const int relative_base_frame = round_fl_to_int((frame_index / (float)frame_step)) * frame_step; + const int relative_base_frame = round_fl_to_int(frame_index / (float)frame_step) * frame_step; const int nearest_guaranted_absolute_frame = relative_base_frame + SEQ_time_left_handle_frame_get(scene, seq); return nearest_guaranted_absolute_frame; diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc index 40504801f67..418330d1e70 100644 --- a/source/blender/editors/space_view3d/space_view3d.cc +++ b/source/blender/editors/space_view3d/space_view3d.cc @@ -641,7 +641,7 @@ static bool view3d_ima_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event static bool view3d_ima_bg_is_camera_view(bContext *C) { RegionView3D *rv3d = CTX_wm_region_view3d(C); - if ((rv3d && (rv3d->persp == RV3D_CAMOB))) { + if (rv3d && (rv3d->persp == RV3D_CAMOB)) { View3D *v3d = CTX_wm_view3d(C); if (v3d && v3d->camera && v3d->camera->type == OB_CAMERA) { return true; diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 6001f701c00..23e06c895fc 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -300,7 +300,7 @@ static int render_border_exec(bContext *C, wmOperator *op) } /* drawing a border outside the camera view switches off border rendering */ - if ((border.xmin == border.xmax || border.ymin == border.ymax)) { + if (border.xmin == border.xmax || border.ymin == border.ymax) { if (rv3d->persp == RV3D_CAMOB) { scene->r.mode &= ~R_BORDER; } diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c index 41af24977db..22ab6636c47 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c @@ -267,7 +267,7 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *g icon_offset_from_axis = icon_offset * 2.1f; break; case USER_MINI_AXIS_TYPE_MINIMAL: - icon_offset_from_axis = (UI_UNIT_X * 2.5) + ((U.rvisize * U.pixelsize * 2.0f)); + icon_offset_from_axis = (UI_UNIT_X * 2.5) + (U.rvisize * U.pixelsize * 2.0f); break; case USER_MINI_AXIS_TYPE_NONE: icon_offset_from_axis = icon_offset_mini * 0.75f; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c index d0f6ca4c922..73617c0670f 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c @@ -129,7 +129,7 @@ static int gizmo_preselect_elem_test_select(bContext *C, wmGizmo *gz, const int ViewLayer *view_layer = CTX_data_view_layer(C); View3D *v3d = CTX_wm_view3d(C); BKE_view_layer_synced_ensure(scene, view_layer); - if (((gz_ele->bases)) == NULL || + if ((gz_ele->bases) == NULL || (gz_ele->bases[0] != BKE_view_layer_active_base_get(view_layer))) { MEM_SAFE_FREE(gz_ele->bases); gz_ele->bases = BKE_view_layer_array_from_bases_in_edit_mode( @@ -358,7 +358,7 @@ static int gizmo_preselect_edgering_test_select(bContext *C, wmGizmo *gz, const ViewLayer *view_layer = CTX_data_view_layer(C); View3D *v3d = CTX_wm_view3d(C); BKE_view_layer_synced_ensure(scene, view_layer); - if (((gz_ring->bases)) == NULL || + if ((gz_ring->bases) == NULL || (gz_ring->bases[0] != BKE_view_layer_active_base_get(view_layer))) { MEM_SAFE_FREE(gz_ring->bases); gz_ring->bases = BKE_view_layer_array_from_bases_in_edit_mode( diff --git a/source/blender/editors/space_view3d/view3d_navigate.c b/source/blender/editors/space_view3d/view3d_navigate.c index b27c65c42ef..25073d02a7f 100644 --- a/source/blender/editors/space_view3d/view3d_navigate.c +++ b/source/blender/editors/space_view3d/view3d_navigate.c @@ -916,15 +916,15 @@ static int viewselected_exec(bContext *C, wmOperator *op) if (gps->editcurve != NULL) { for (int i = 0; i < gps->editcurve->tot_curve_points; i++) { BezTriple *bezt = &gps->editcurve->curve_points[i].bezt; - if ((bezt->f1 & SELECT)) { + if (bezt->f1 & SELECT) { minmax_v3v3_v3(min, max, bezt->vec[0]); ok = true; } - if ((bezt->f2 & SELECT)) { + if (bezt->f2 & SELECT) { minmax_v3v3_v3(min, max, bezt->vec[1]); ok = true; } - if ((bezt->f3 & SELECT)) { + if (bezt->f3 & SELECT) { minmax_v3v3_v3(min, max, bezt->vec[2]); ok = true; } diff --git a/source/blender/editors/space_view3d/view3d_navigate_ndof.c b/source/blender/editors/space_view3d/view3d_navigate_ndof.c index 88abf602c26..22b3a4b968e 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_ndof.c +++ b/source/blender/editors/space_view3d/view3d_navigate_ndof.c @@ -363,7 +363,7 @@ static int view3d_ndof_cameraview_pan_zoom(bContext *C, const wmEvent *event) ED_view3d_smooth_view_force_finish(C, v3d, region); - if ((v3d->camera && (rv3d->persp == RV3D_CAMOB) && (v3d->flag2 & V3D_LOCK_CAMERA) == 0)) { + if (v3d->camera && (rv3d->persp == RV3D_CAMOB) && (v3d->flag2 & V3D_LOCK_CAMERA) == 0) { /* pass */ } else { diff --git a/source/blender/editors/space_view3d/view3d_placement.c b/source/blender/editors/space_view3d/view3d_placement.c index d3b82476d09..7588ad8d2c1 100644 --- a/source/blender/editors/space_view3d/view3d_placement.c +++ b/source/blender/editors/space_view3d/view3d_placement.c @@ -585,13 +585,13 @@ static void draw_primitive_view_impl(const struct bContext *C, } else if (ipd->primitive_type == PLACE_PRIMITIVE_TYPE_CYLINDER) { draw_circle_in_quad(UNPACK4(bounds.vec), 32, color); - draw_circle_in_quad(UNPACK4((&bounds.vec[4])), 32, color); + draw_circle_in_quad(UNPACK4(&bounds.vec[4]), 32, color); } else if (ipd->primitive_type == PLACE_PRIMITIVE_TYPE_CONE) { draw_circle_in_quad(UNPACK4(bounds.vec), 32, color); float center[3]; - mid_v3_v3v3v3v3(center, UNPACK4((&bounds.vec[4]))); + mid_v3_v3v3v3v3(center, UNPACK4(&bounds.vec[4])); float coords_a[4][3]; float coords_b[4][3]; diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc index a0b3802076a..9a2512adc31 100644 --- a/source/blender/editors/space_view3d/view3d_select.cc +++ b/source/blender/editors/space_view3d/view3d_select.cc @@ -1527,7 +1527,7 @@ static int object_select_menu_exec(bContext *C, wmOperator *op) changed = true; } - if ((oldbasact != basact)) { + if (oldbasact != basact) { ED_object_base_activate(C, basact); } diff --git a/source/blender/editors/transform/transform_convert_sequencer.c b/source/blender/editors/transform/transform_convert_sequencer.c index ddc99caeef5..090f1bf1e6c 100644 --- a/source/blender/editors/transform/transform_convert_sequencer.c +++ b/source/blender/editors/transform/transform_convert_sequencer.c @@ -94,7 +94,7 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *r_count, int *r_flag) int left = SEQ_time_left_handle_frame_get(scene, seq); int right = SEQ_time_right_handle_frame_get(scene, seq); - if (((seq->flag & SELECT) == 0 || SEQ_transform_is_locked(channels, seq))) { + if ((seq->flag & SELECT) == 0 || SEQ_transform_is_locked(channels, seq)) { *r_count = 0; *r_flag = 0; } diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 03c53e1b3d2..301eac4536e 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -317,7 +317,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve } /* initialize UV transform from */ - if (op && ((prop = RNA_struct_find_property(op->ptr, "correct_uv")))) { + if (op && (prop = RNA_struct_find_property(op->ptr, "correct_uv"))) { if (RNA_property_is_set(op->ptr, prop)) { if (RNA_property_boolean_get(op->ptr, prop)) { t->settings->uvcalc_flag |= UVCALC_TRANSFORM_CORRECT_SLIDE; diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 31d36fc4d92..a3effa32072 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -809,7 +809,7 @@ static void initSnappingMode(TransInfo *t) (bool (*)(BMVert *, void *))BM_elem_cb_check_hflag_disabled, bm_edge_is_snap_target, bm_face_is_snap_target, - POINTER_FROM_UINT((BM_ELEM_SELECT | BM_ELEM_HIDDEN))); + POINTER_FROM_UINT(BM_ELEM_SELECT | BM_ELEM_HIDDEN)); } else { /* Ignore hidden geometry in the general case. */ diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp index 116154650f3..605601af7cc 100644 --- a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp +++ b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp @@ -173,8 +173,8 @@ struct GeomCleanerHasher { inline size_t operator()(const Vec3r &p) const { size_t res = ((unsigned long)(p[0] * _MUL)) % _MOD; - res = ((res + (unsigned long)(p[1]) * _MUL)) % _MOD; - return ((res + (unsigned long)(p[2]) * _MUL)) % _MOD; + res = (res + (unsigned long)(p[1]) * _MUL) % _MOD; + return (res + (unsigned long)(p[2]) * _MUL) % _MOD; } #undef _MUL #undef _MOD diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp index c801dc70114..75115b4abac 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp @@ -373,7 +373,7 @@ int BezierCurveShader::shade(Stroke &stroke) const ++v; for (vend = stroke.strokeVerticesEnd(); v != vend; ++v) { if (!((fabs(v->x() - (previous)->x()) < M_EPSILON) && - ((fabs(v->y() - (previous)->y()) < M_EPSILON)))) { + (fabs(v->y() - (previous)->y()) < M_EPSILON))) { data.emplace_back(v->x(), v->y()); } previous = v; @@ -395,7 +395,7 @@ int BezierCurveShader::shade(Stroke &stroke) const p = segmentsVertices.begin(); ++p; for (pend = segmentsVertices.end(); p != pend; ++p) { - CurveVertices.push_back((*p)); + CurveVertices.push_back(*p); } } @@ -660,7 +660,7 @@ int TipRemoverShader::shade(Stroke &stroke) const vector<StrokeVertex *>::iterator sv, svend; for (sv = verticesToRemove.begin(), svend = verticesToRemove.end(); sv != svend; ++sv) { - stroke.RemoveVertex((*sv)); + stroke.RemoveVertex(*sv); } // Resample so that our new stroke have the same number of vertices than before diff --git a/source/blender/freestyle/intern/stroke/Chain.cpp b/source/blender/freestyle/intern/stroke/Chain.cpp index 3778727da37..b3f4d4547e9 100644 --- a/source/blender/freestyle/intern/stroke/Chain.cpp +++ b/source/blender/freestyle/intern/stroke/Chain.cpp @@ -120,7 +120,7 @@ void Chain::push_viewedge_front(ViewEdge *iViewEdge, bool orientation) } do { current = (*v)->point2d(); - Curve::push_vertex_front((*v)); + Curve::push_vertex_front(*v); //_Length += (current - previous).norm(); previous = current; if (orientation) { diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp index 2dce6140c3f..07ba45b81ab 100644 --- a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp @@ -64,7 +64,7 @@ NodeGroup *StrokeTesselator::Tesselate(StrokeVertexIterator begin, StrokeVertexI tshape->setFrsMaterial(_FrsMaterial); for (StrokeVertexIterator c = begin, cend = end; c != cend; c++) { - tshape->AddRep(Tesselate((*c))); + tshape->AddRep(Tesselate(*c)); } return group; diff --git a/source/blender/freestyle/intern/view_map/Functions0D.cpp b/source/blender/freestyle/intern/view_map/Functions0D.cpp index a461f368859..24625d39781 100644 --- a/source/blender/freestyle/intern/view_map/Functions0D.cpp +++ b/source/blender/freestyle/intern/view_map/Functions0D.cpp @@ -105,14 +105,14 @@ void getOccludersF0D(Interface0DIterator &it, set<ViewShape *> &oOccluders) occluder_container::const_iterator oitend = ve1->occluders_end(); for (; oit != oitend; ++oit) { - oOccluders.insert((*oit)); + oOccluders.insert(*oit); } if (ve2 != nullptr) { oit = ve2->occluders_begin(); oitend = ve2->occluders_end(); for (; oit != oitend; ++oit) { - oOccluders.insert((*oit)); + oOccluders.insert(*oit); } } } @@ -355,7 +355,7 @@ int GetOccludersF0D::operator()(Interface0DIterator &iter) // vsOccluders.insert(vsOccluders.begin(), occluders.begin(), occluders.end()); for (set<ViewShape *>::iterator it = occluders.begin(), itend = occluders.end(); it != itend; ++it) { - result.push_back((*it)); + result.push_back(*it); } return 0; } diff --git a/source/blender/freestyle/intern/view_map/Silhouette.cpp b/source/blender/freestyle/intern/view_map/Silhouette.cpp index 54e0626a7af..2398e82aca7 100644 --- a/source/blender/freestyle/intern/view_map/Silhouette.cpp +++ b/source/blender/freestyle/intern/view_map/Silhouette.cpp @@ -297,7 +297,7 @@ real FEdge::z_discontinuity() const z_discontinuity_functor<SVertex> _functor; Evaluate<SVertex, z_discontinuity_functor<SVertex>>(&_functor, iCombination, result); #endif - Vec3r middle((_VertexB->point3d() - _VertexA->point3d())); + Vec3r middle(_VertexB->point3d() - _VertexA->point3d()); middle /= 2; Vec3r disc_vec(middle - _occludeeIntersection); real res = disc_vec.norm() / bboxsize; diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp index 81e7abf6d5c..798f01a9aa5 100644 --- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp @@ -57,7 +57,7 @@ void ViewEdgeXBuilder::BuildViewEdges(WXShape *iWShape, WXFace *wxf; for (wf = wfaces.begin(), wfend = wfaces.end(); wf != wfend; wf++) { wxf = dynamic_cast<WXFace *>(*wf); - if (false == ((wxf))->hasSmoothEdges()) { // does it contain at least one smooth edge ? + if (false == (wxf)->hasSmoothEdges()) { // does it contain at least one smooth edge ? continue; } // parse all smooth layers: @@ -68,7 +68,7 @@ void ViewEdgeXBuilder::BuildViewEdges(WXShape *iWShape, if (!(*sl)->hasSmoothEdge()) { continue; } - if (stopSmoothViewEdge((*sl))) { // has it been parsed already ? + if (stopSmoothViewEdge(*sl)) { // has it been parsed already ? continue; } // here we know that we're dealing with a face layer that has not been processed yet and that diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index 5642a80e77f..17447ced5e4 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -595,7 +595,7 @@ static void computeCumulativeVisibility(ViewMap *ioViewMap, for (set<ViewShape *>::iterator o = foundOccluders.begin(), oend = foundOccluders.end(); o != oend; ++o) { - (*ve)->AddOccluder((*o)); + (*ve)->AddOccluder(*o); } #if LOGGING if (_global.debug & G_DEBUG_FREESTYLE) { @@ -786,7 +786,7 @@ static void computeDetailedVisibility(ViewMap *ioViewMap, for (set<ViewShape *>::iterator o = foundOccluders.begin(), oend = foundOccluders.end(); o != oend; ++o) { - (*ve)->AddOccluder((*o)); + (*ve)->AddOccluder(*o); } #if LOGGING if (_global.debug & G_DEBUG_FREESTYLE) { @@ -925,7 +925,7 @@ static void computeFastVisibility(ViewMap *ioViewMap, G &grid, real epsilon) for (set<ViewShape *>::iterator o = foundOccluders.begin(), oend = foundOccluders.end(); o != oend; ++o) { - (*ve)->AddOccluder((*o)); + (*ve)->AddOccluder(*o); } // occludee -- @@ -1658,7 +1658,7 @@ void ViewMapBuilder::ComputeRayCastingVisibility(ViewMap *ioViewMap, real epsilo // occluders -- for (set<ViewShape *>::iterator o = occluders.begin(), oend = occluders.end(); o != oend; ++o) { - (*ve)->AddOccluder((*o)); + (*ve)->AddOccluder(*o); } #if LOGGING if (_global.debug & G_DEBUG_FREESTYLE) { diff --git a/source/blender/geometry/intern/trim_curves.cc b/source/blender/geometry/intern/trim_curves.cc index cd93f295685..bda44e09da8 100644 --- a/source/blender/geometry/intern/trim_curves.cc +++ b/source/blender/geometry/intern/trim_curves.cc @@ -21,7 +21,7 @@ namespace blender::geometry { /** \name Curve Enums * \{ */ -#define CURVE_TYPE_AS_MASK(curve_type) ((CurveTypeMask)((1 << (int)(curve_type)))) +#define CURVE_TYPE_AS_MASK(curve_type) ((CurveTypeMask)(1 << (int)(curve_type))) typedef enum CurveTypeMask { CURVE_TYPE_MASK_CATMULL_ROM = (1 << 0), diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c index c12521b7347..bff6cb9ed48 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c @@ -1397,7 +1397,7 @@ void lineart_main_discard_out_of_frame_edges(LineartData *ld) LISTBASE_FOREACH (LineartElementLinkNode *, eln, &ld->geom.line_buffer_pointers) { e = (LineartEdge *)eln->pointer; for (i = 0; i < eln->element_count; i++) { - if ((LRT_VERT_OUT_OF_BOUND(e[i].v1) && LRT_VERT_OUT_OF_BOUND(e[i].v2))) { + if (LRT_VERT_OUT_OF_BOUND(e[i].v1) && LRT_VERT_OUT_OF_BOUND(e[i].v2)) { e[i].flags = LRT_EDGE_FLAG_CHAIN_PICKED; } } diff --git a/source/blender/gpu/opengl/gl_debug.cc b/source/blender/gpu/opengl/gl_debug.cc index 4c9f766c93c..38dd339882d 100644 --- a/source/blender/gpu/opengl/gl_debug.cc +++ b/source/blender/gpu/opengl/gl_debug.cc @@ -80,7 +80,7 @@ static void APIENTRY debug_callback(GLenum UNUSED(source), const bool use_color = CLG_color_support_get(&LOG); if (ELEM(severity, GL_DEBUG_SEVERITY_LOW, GL_DEBUG_SEVERITY_NOTIFICATION)) { - if (((LOG.type->flag & CLG_FLAG_USE) && (LOG.type->level >= CLG_SEVERITY_INFO))) { + if ((LOG.type->flag & CLG_FLAG_USE) && (LOG.type->level >= CLG_SEVERITY_INFO)) { const char *format = use_color ? "\033[2m%s\033[0m" : "%s"; CLG_logf(LOG.type, CLG_SEVERITY_INFO, "Notification", "", format, message); } @@ -110,7 +110,7 @@ static void APIENTRY debug_callback(GLenum UNUSED(source), break; } - if (((LOG.type->flag & CLG_FLAG_USE) && (LOG.type->level <= clog_severity))) { + if ((LOG.type->flag & CLG_FLAG_USE) && (LOG.type->level <= clog_severity)) { CLG_logf(LOG.type, clog_severity, debug_groups, "", "%s", message); if (severity == GL_DEBUG_SEVERITY_HIGH) { /* Focus on error message. */ diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index a4f1f5e813a..7c2ced512f6 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -215,7 +215,7 @@ struct anim_index *IMB_indexer_open(const char *name) return NULL; } - if (((ENDIAN_ORDER == B_ENDIAN) != (header[8] == 'V'))) { + if ((ENDIAN_ORDER == B_ENDIAN) != (header[8] == 'V')) { for (i = 0; i < idx->num_entries; i++) { BLI_endian_switch_int32(&idx->entries[i].frameno); BLI_endian_switch_uint64(&idx->entries[i].seek_pos); diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c index df6959ca90b..1736329cbff 100644 --- a/source/blender/imbuf/intern/png.c +++ b/source/blender/imbuf/intern/png.c @@ -129,7 +129,7 @@ bool imb_savepng(struct ImBuf *ibuf, const char *filepath, int flags) /* use the jpeg quality setting for compression */ int compression; - compression = (int)(((float)(ibuf->foptions.quality) / 11.1111f)); + compression = (int)((float)(ibuf->foptions.quality) / 11.1111f); compression = compression < 0 ? 0 : (compression > 9 ? 9 : compression); if (ibuf->float_colorspace || (ibuf->colormanage_flag & IMB_COLORMANAGE_IS_DATA)) { diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp index f056488fe93..c7db2356d20 100644 --- a/source/blender/io/collada/ArmatureImporter.cpp +++ b/source/blender/io/collada/ArmatureImporter.cpp @@ -1022,7 +1022,7 @@ bool ArmatureImporter::get_joint_bind_mat(float m[4][4], COLLADAFW::Node *joint) bool found = false; for (it = skin_by_data_uid.begin(); it != skin_by_data_uid.end(); it++) { SkinInfo &skin = it->second; - if ((found = skin.get_joint_inv_bind_matrix(m, joint))) { + if (found = skin.get_joint_inv_bind_matrix(m, joint)) { invert_m4(m); break; } diff --git a/source/blender/io/collada/BCMath.cpp b/source/blender/io/collada/BCMath.cpp index d48e46ca115..924cee7f3b2 100644 --- a/source/blender/io/collada/BCMath.cpp +++ b/source/blender/io/collada/BCMath.cpp @@ -169,7 +169,7 @@ void BCMatrix::get_matrix(DMatrix &mat, const bool transposed, const int precisi for (int j = 0; j < 4; j++) { float val = (transposed) ? matrix[j][i] : matrix[i][j]; if (precision >= 0) { - val = floor((val * pow(10, precision) + 0.5)) / pow(10, precision); + val = floor(val * pow(10, precision) + 0.5) / pow(10, precision); } mat[i][j] = val; } @@ -185,7 +185,7 @@ void BCMatrix::get_matrix(Matrix &mat, for (int j = 0; j < 4; j++) { float val = (transposed) ? matrix[j][i] : matrix[i][j]; if (precision >= 0) { - val = floor((val * pow(10, precision) + 0.5)) / pow(10, precision); + val = floor(val * pow(10, precision) + 0.5) / pow(10, precision); } mat[i][j] = val; } diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc index 27b71319f39..91b59059545 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc @@ -369,7 +369,7 @@ float3 OBJMesh::calc_poly_normal(const int poly_index) const static float round_float_to_n_digits(const float f, int round_digits) { float scale = powf(10.0, round_digits); - return ceilf((scale * f - 0.49999999f)) / scale; + return ceilf(scale * f - 0.49999999f) / scale; } static float3 round_float3_to_n_digits(const float3 &v, int round_digits) diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index e5932f33604..e6135848b85 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -3620,7 +3620,7 @@ void RNA_property_pointer_add(PointerRNA *ptr, PropertyRNA *prop) BLI_assert(RNA_property_type(prop) == PROP_POINTER); - if ((/*idprop=*/rna_idproperty_check(&prop, ptr))) { + if (/*idprop=*/rna_idproperty_check(&prop, ptr)) { /* already exists */ } else if (prop->flag & PROP_IDPROPERTY) { @@ -5951,7 +5951,7 @@ void RNA_parameter_list_begin(ParameterList *parms, ParameterIterator *iter) if (iter->valid) { iter->size = rna_parameter_size(iter->parm); - iter->data = (((char *)iter->parms->data)); /* +iter->offset, always 0 */ + iter->data = ((char *)iter->parms->data); /* +iter->offset, always 0 */ } } diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 44b642d0fcc..a66a347f905 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -2753,7 +2753,7 @@ void RNA_def_property_pointer_sdna(PropertyRNA *prop, const char *structname, co return; } - if ((/* dp= */ rna_def_property_sdna(prop, structname, propname))) { + if (/* dp= */ rna_def_property_sdna(prop, structname, propname)) { if (prop->arraydimension) { prop->arraydimension = 0; prop->totarraylength = 0; diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c index caada225e75..24a1e743ee7 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.c +++ b/source/blender/modifiers/intern/MOD_normal_edit.c @@ -509,7 +509,7 @@ static Mesh *normalEditModifier_do(NormalEditModifierData *enmd, } Mesh *result; - if (BKE_mesh_edges(mesh) == BKE_mesh_edges(((Mesh *)ob->data))) { + if (BKE_mesh_edges(mesh) == BKE_mesh_edges((Mesh *)ob->data)) { /* We need to duplicate data here, otherwise setting custom normals * (which may also affect sharp edges) could * modify original mesh, see T43671. */ diff --git a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc index 0065012db97..e90967838d3 100644 --- a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc +++ b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc @@ -157,7 +157,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * volume_grid); openvdb::math::Transform::Ptr transform = local_grid->transform().copy(); - transform->postMult(openvdb::Mat4d(((float *)vmmd->object->obmat))); + transform->postMult(openvdb::Mat4d((float *)vmmd->object->obmat)); openvdb::Mat4d imat = openvdb::Mat4d((float *)ctx->object->imat); /* `imat` had floating point issues and wasn't affine. */ imat.setCol(3, openvdb::Vec4d(0, 0, 0, 1)); diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc index a0bd28218cc..aa9070268f0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc @@ -99,7 +99,7 @@ class PositionsVDBWrapper { void add(const openvdb::Vec3R &pos) { - vector_.append((float3((float)pos[0], (float)pos[1], (float)pos[2]) + offset_fix_)); + vector_.append(float3((float)pos[0], (float)pos[1], (float)pos[2]) + offset_fix_); } }; diff --git a/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc b/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc index 33802d00d2b..4b8af1649d4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc @@ -25,7 +25,7 @@ static void node_declare(NodeDeclarationBuilder &b) b.add_input<decl::Image>(N_("Image")).hide_label(); b.add_input<decl::Vector>(N_("Vector")) .implicit_field() - .description(("Texture coordinates from 0 to 1")); + .description("Texture coordinates from 0 to 1"); b.add_input<decl::Int>(N_("Frame")).min(0).max(MAXFRAMEF); b.add_output<decl::Color>(N_("Color")).no_muted_links().dependent_field(); b.add_output<decl::Float>(N_("Alpha")).no_muted_links().dependent_field(); diff --git a/source/blender/nodes/intern/node_common.cc b/source/blender/nodes/intern/node_common.cc index 1f085375329..022ea3313e2 100644 --- a/source/blender/nodes/intern/node_common.cc +++ b/source/blender/nodes/intern/node_common.cc @@ -221,7 +221,7 @@ void node_group_update(struct bNodeTree *ntree, struct bNode *node) if (node->id == nullptr) { nodeRemoveAllSockets(ntree, node); } - else if ((ID_IS_LINKED(node->id) && (node->id->tag & LIB_TAG_MISSING))) { + else if (ID_IS_LINKED(node->id) && (node->id->tag & LIB_TAG_MISSING)) { /* Missing data-block, leave sockets unchanged so that when it comes back * the links remain valid. */ } diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c index 36ab1e86d92..fd5f2e77672 100644 --- a/source/blender/python/generic/bgl.c +++ b/source/blender/python/generic/bgl.c @@ -732,7 +732,7 @@ static PyObject *Buffer_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject if (PyLong_Check(length_ob)) { ndimensions = 1; - if (((dimensions[0] = PyLong_AsLong(length_ob)) < 1)) { + if ((dimensions[0] = PyLong_AsLong(length_ob)) < 1) { PyErr_SetString(PyExc_AttributeError, "dimensions must be between 1 and " STRINGIFY(MAX_DIMENSIONS)); return NULL; diff --git a/source/blender/python/gpu/gpu_py_buffer.c b/source/blender/python/gpu/gpu_py_buffer.c index 9a415b7f2c4..551eb4451c2 100644 --- a/source/blender/python/gpu/gpu_py_buffer.c +++ b/source/blender/python/gpu/gpu_py_buffer.c @@ -61,7 +61,7 @@ static bool pygpu_buffer_pyobj_as_shape(PyObject *shape_obj, Py_ssize_t shape_len = 0; if (PyLong_Check(shape_obj)) { shape_len = 1; - if (((r_shape[0] = PyLong_AsLong(shape_obj)) < 1)) { + if ((r_shape[0] = PyLong_AsLong(shape_obj)) < 1) { PyErr_SetString(PyExc_AttributeError, "dimension must be greater than or equal to 1"); return false; } diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c index 152c871c9be..7627d498774 100644 --- a/source/blender/python/intern/bpy_app_translations.c +++ b/source/blender/python/intern/bpy_app_translations.c @@ -424,7 +424,7 @@ static PyObject *app_translations_contexts_make(void) } #define SetObjString(item) \ - PyStructSequence_SET_ITEM(translations_contexts, pos++, PyUnicode_FromString((item))) + PyStructSequence_SET_ITEM(translations_contexts, pos++, PyUnicode_FromString(item)) #define SetObjNone() \ PyStructSequence_SET_ITEM(translations_contexts, pos++, Py_INCREF_RET(Py_None)) diff --git a/source/blender/python/intern/bpy_driver.c b/source/blender/python/intern/bpy_driver.c index 04aa203d198..9f2714405a9 100644 --- a/source/blender/python/intern/bpy_driver.c +++ b/source/blender/python/intern/bpy_driver.c @@ -225,7 +225,7 @@ static void bpy_pydriver_namespace_update_depsgraph(struct Depsgraph *depsgraph) } if ((g_pydriver_state_prev.depsgraph == NULL) || - ((depsgraph != g_pydriver_state_prev.depsgraph->ptr.data))) { + (depsgraph != g_pydriver_state_prev.depsgraph->ptr.data)) { PyObject *item = bpy_pydriver_depsgraph_as_pyobject(depsgraph); PyDict_SetItem(bpy_pydriver_Dict, bpy_intern_str_depsgraph, item); Py_DECREF(item); diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index 3f2154189e8..ff84a5c75d7 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -394,7 +394,7 @@ static int bpy_prop_array_length_parse(PyObject *o, void *p) if (PyLong_CheckExact(o)) { int size; - if (((size = PyLong_AsLong(o)) == -1)) { + if ((size = PyLong_AsLong(o)) == -1) { PyErr_Format( PyExc_ValueError, "expected number or sequence of numbers, got %s", Py_TYPE(o)->tp_name); return 0; @@ -427,7 +427,7 @@ static int bpy_prop_array_length_parse(PyObject *o, void *p) PyObject **seq_items = PySequence_Fast_ITEMS(seq_fast); for (int i = 0; i < seq_len; i++) { int size; - if (((size = PyLong_AsLong(seq_items[i])) == -1)) { + if ((size = PyLong_AsLong(seq_items[i])) == -1) { Py_DECREF(seq_fast); PyErr_Format(PyExc_ValueError, "expected number in sequence, got %s at index %d", diff --git a/source/blender/python/mathutils/mathutils.c b/source/blender/python/mathutils/mathutils.c index 7cba95a1f85..2bf608fd1d6 100644 --- a/source/blender/python/mathutils/mathutils.c +++ b/source/blender/python/mathutils/mathutils.c @@ -47,8 +47,7 @@ static int mathutils_array_parse_fast(float *array, i = size; do { i--; - if (((array[i] = PyFloat_AsDouble((item = value_fast_items[i]))) == -1.0f) && - PyErr_Occurred()) { + if (((array[i] = PyFloat_AsDouble(item = value_fast_items[i])) == -1.0f) && PyErr_Occurred()) { PyErr_Format(PyExc_TypeError, "%.200s: sequence index %d expected a number, " "found '%.200s' type, ", @@ -317,7 +316,7 @@ int mathutils_int_array_parse(int *array, int array_dim, PyObject *value, const i = size; while (i > 0) { i--; - if (((array[i] = PyC_Long_AsI32((item = value_fast_items[i]))) == -1) && PyErr_Occurred()) { + if (((array[i] = PyC_Long_AsI32(item = value_fast_items[i])) == -1) && PyErr_Occurred()) { PyErr_Format(PyExc_TypeError, "%.200s: sequence index %d expected an int", error_prefix, i); size = -1; break; diff --git a/source/blender/python/mathutils/mathutils_Euler.c b/source/blender/python/mathutils/mathutils_Euler.c index 8f950bce344..78c98d8f482 100644 --- a/source/blender/python/mathutils/mathutils_Euler.c +++ b/source/blender/python/mathutils/mathutils_Euler.c @@ -32,10 +32,10 @@ static const char *euler_order_str(EulerObject *self) short euler_order_from_string(const char *str, const char *error_prefix) { - if ((str[0] && str[1] && str[2] && str[3] == '\0')) { + if (str[0] && str[1] && str[2] && str[3] == '\0') { #ifdef __LITTLE_ENDIAN__ -# define MAKE_ID3(a, b, c) (((a)) | ((b) << 8) | ((c) << 16)) +# define MAKE_ID3(a, b, c) ((a) | ((b) << 8) | ((c) << 16)) #else # define MAKE_ID3(a, b, c) (((a) << 24) | ((b) << 16) | ((c) << 8)) #endif diff --git a/source/blender/python/mathutils/mathutils_Quaternion.c b/source/blender/python/mathutils/mathutils_Quaternion.c index d405d5e63ce..892f38d22ae 100644 --- a/source/blender/python/mathutils/mathutils_Quaternion.c +++ b/source/blender/python/mathutils/mathutils_Quaternion.c @@ -1177,7 +1177,7 @@ static PyObject *Quaternion_mul(PyObject *q1, PyObject *q2) } } else if (quat1) { /* QUAT * FLOAT */ - if ((((scalar = PyFloat_AsDouble(q2)) == -1.0f && PyErr_Occurred()) == 0)) { + if (((scalar = PyFloat_AsDouble(q2)) == -1.0f && PyErr_Occurred()) == 0) { return quat_mul_float(quat1, scalar); } } diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c index 4548975574d..c6f4d47ac75 100644 --- a/source/blender/sequencer/intern/sequencer.c +++ b/source/blender/sequencer/intern/sequencer.c @@ -171,7 +171,7 @@ static void seq_sequence_free_ex(Scene *scene, } if (seq->sound && do_id_user) { - id_us_min(((ID *)seq->sound)); + id_us_min((ID *)seq->sound); } if (seq->stereo3d_format) { diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc index 82a554d80b4..2fcb39aeee4 100644 --- a/source/blender/windowmanager/intern/wm_event_system.cc +++ b/source/blender/windowmanager/intern/wm_event_system.cc @@ -2387,7 +2387,7 @@ static int wm_handler_operator_call(bContext *C, /* When the window changes the modal modifier may have loaded a new blend file * (the `system_demo_mode` add-on does this), so we have to assume the event, * operator, area, region etc have all been freed. */ - if ((CTX_wm_window(C) == win)) { + if (CTX_wm_window(C) == win) { wm_event_modalkeymap_end(event, &event_backup); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 09e64db6416..58791dbd00a 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2740,7 +2740,7 @@ static int radial_control_invoke(bContext *C, wmOperator *op, const wmEvent *eve } /* get type, initial, min, and max values of the property */ - switch ((rc->type = RNA_property_type(rc->prop))) { + switch (rc->type = RNA_property_type(rc->prop)) { case PROP_INT: { int value, min, max, step; diff --git a/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.c b/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.c index 0e4f6a937bd..ad4db2be54d 100644 --- a/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.c +++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus_static.c @@ -31,7 +31,7 @@ static bool wm_msg_static_gset_cmp(const void *key_a_p, const void *key_b_p) { const wmMsgParams_Static *params_a = &((const wmMsgSubscribeKey_Static *)key_a_p)->msg.params; const wmMsgParams_Static *params_b = &((const wmMsgSubscribeKey_Static *)key_b_p)->msg.params; - return !((params_a->event == params_b->event)); + return !(params_a->event == params_b->event); } static void wm_msg_static_gset_key_free(void *key_p) { |