[Bf-blender-cvs] [b280699078e] master: Cleanup: use elem macros
Campbell Barton
noreply at git.blender.org
Wed Oct 20 02:16:58 CEST 2021
Commit: b280699078eee23bd8eb572668d6f0d8972d879a
Author: Campbell Barton
Date: Wed Oct 20 10:45:59 2021 +1100
Branches: master
https://developer.blender.org/rBb280699078eee23bd8eb572668d6f0d8972d879a
Cleanup: use elem macros
===================================================================
M source/blender/blendthumb/src/blendthumb_extract.cc
M source/blender/blenkernel/intern/attribute_access.cc
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/fluid.c
M source/blender/blenkernel/intern/mesh_convert.cc
M source/blender/blenkernel/intern/node.cc
M source/blender/blenkernel/intern/object.c
M source/blender/blenlib/intern/boxpack_2d.c
M source/blender/blenlib/intern/delaunay_2d.cc
M source/blender/blenlib/intern/filereader_gzip.c
M source/blender/blenlib/intern/noise.cc
M source/blender/blenlib/intern/scanfill_utils.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache_impl_displist.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editcurve_add.c
M source/blender/editors/gpencil/gpencil_bake_animation.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_region_popup.c
M source/blender/editors/mesh/editmesh_bevel.c
M source/blender/editors/mesh/editmesh_rip.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_bake.c
M source/blender/editors/sculpt_paint/paint_cursor.c
M source/blender/editors/sculpt_paint/paint_vertex.c
M source/blender/editors/sculpt_paint/paint_vertex_color_ops.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_image/image_edit.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_thumbnails.c
M source/blender/editors/transform/transform_convert_object.c
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M source/blender/imbuf/intern/bmp.c
M source/blender/imbuf/intern/tiff.c
M source/blender/io/avi/intern/avi.c
M source/blender/io/usd/intern/usd_reader_material.cc
M source/blender/io/usd/intern/usd_reader_mesh.cc
M source/blender/makesdna/intern/dna_genfile.c
M source/blender/modifiers/intern/MOD_mask.cc
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc
M source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
M source/blender/nodes/shader/node_shader_util.c
M source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
M source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc
M source/blender/python/intern/bpy_rna.c
M source/blender/python/mathutils/mathutils_Matrix.c
M source/blender/render/intern/texture_image.c
M source/blender/sequencer/intern/image_cache.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/xr/intern/wm_xr_action.c
===================================================================
diff --git a/source/blender/blendthumb/src/blendthumb_extract.cc b/source/blender/blendthumb/src/blendthumb_extract.cc
index 99b13c89994..f1c5567bab5 100644
--- a/source/blender/blendthumb/src/blendthumb_extract.cc
+++ b/source/blender/blendthumb/src/blendthumb_extract.cc
@@ -42,7 +42,7 @@ static bool blend_header_check_magic(const char header[12])
return false;
}
/* Check pointer size and endianness indicators. */
- if (((header[7] != '_') && (header[7] != '-')) || ((header[8] != 'v') && (header[8] != 'V'))) {
+ if (!ELEM(header[7], '_', '-') || !ELEM(header[8], 'v', 'V')) {
return false;
}
/* Check version number. */
diff --git a/source/blender/blenkernel/intern/attribute_access.cc b/source/blender/blenkernel/intern/attribute_access.cc
index 0658569752c..d0510e0008e 100644
--- a/source/blender/blenkernel/intern/attribute_access.cc
+++ b/source/blender/blenkernel/intern/attribute_access.cc
@@ -1060,7 +1060,7 @@ std::unique_ptr<blender::fn::GVArray> GeometryComponent::attribute_try_get_for_r
}
std::unique_ptr<blender::fn::GVArray> varray = std::move(attribute.varray);
- if (domain != ATTR_DOMAIN_AUTO && attribute.domain != domain) {
+ if (!ELEM(domain, ATTR_DOMAIN_AUTO, attribute.domain)) {
varray = this->attribute_try_adapt_domain(std::move(varray), attribute.domain, domain);
if (!varray) {
return {};
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index b0fc1426093..620110f7881 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -3347,7 +3347,7 @@ static void calchandleNurb_intern(BezTriple *bezt,
if (skip_align ||
/* when one handle is free, alignming makes no sense, see: T35952 */
- (ELEM(HD_FREE, bezt->h1, bezt->h2)) ||
+ ELEM(HD_FREE, bezt->h1, bezt->h2) ||
/* also when no handles are aligned, skip this step */
(!ELEM(HD_ALIGN, bezt->h1, bezt->h2) && !ELEM(HD_ALIGN_DOUBLESIDE, bezt->h1, bezt->h2))) {
/* handles need to be updated during animation and applying stuff like hooks,
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 6fc3e0fa8e2..2ef7ef91160 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -5883,8 +5883,7 @@ static void dynamic_paint_surface_pre_step_cb(void *__restrict userdata,
}
/* dissolve for float types */
else if (surface->flags & MOD_DPAINT_DISSOLVE &&
- (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE ||
- surface->type == MOD_DPAINT_SURFACE_T_WEIGHT)) {
+ ELEM(surface->type, MOD_DPAINT_SURFACE_T_DISPLACE, MOD_DPAINT_SURFACE_T_WEIGHT)) {
float *point = &((float *)sData->type_data)[index];
/* log or linear */
value_dissolve(
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index e272b71acb8..6b7594dcf36 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -2676,7 +2676,7 @@ static void update_flowsflags(FluidDomainSettings *fds, Object **flowobjs, int n
}
/* Activate color field if flows add smoke with varying colors. */
if (ffs->density != 0.0 &&
- (ffs->type == FLUID_FLOW_TYPE_SMOKE || ffs->type == FLUID_FLOW_TYPE_SMOKEFIRE)) {
+ ELEM(ffs->type, FLUID_FLOW_TYPE_SMOKE, FLUID_FLOW_TYPE_SMOKEFIRE)) {
if (!(active_fields & FLUID_DOMAIN_ACTIVE_COLOR_SET)) {
copy_v3_v3(fds->active_color, ffs->color);
active_fields |= FLUID_DOMAIN_ACTIVE_COLOR_SET;
diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc
index 59cdb6a2b27..adfbe4b8c94 100644
--- a/source/blender/blenkernel/intern/mesh_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_convert.cc
@@ -454,10 +454,10 @@ static int mesh_nurbs_displist_to_mdata(const Curve *cu,
mloopuv->uv[1] = (v % dl->nr) / (float)orco_sizeu;
/* cyclic correction */
- if ((i == 1 || i == 2) && mloopuv->uv[0] == 0.0f) {
+ if ((ELEM(i, 1, 2)) && mloopuv->uv[0] == 0.0f) {
mloopuv->uv[0] = 1.0f;
}
- if ((i == 0 || i == 1) && mloopuv->uv[1] == 0.0f) {
+ if ((ELEM(i, 0, 1)) && mloopuv->uv[1] == 0.0f) {
mloopuv->uv[1] = 1.0f;
}
}
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 0dffa63d044..b47fe45c868 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -1417,7 +1417,7 @@ void nodeUnregisterType(bNodeType *nt)
bool nodeTypeUndefined(bNode *node)
{
return (node->typeinfo == &NodeTypeUndefined) ||
- ((node->type == NODE_GROUP || node->type == NODE_CUSTOM_GROUP) && node->id &&
+ ((ELEM(node->type, NODE_GROUP, NODE_CUSTOM_GROUP)) && node->id &&
ID_IS_LINKED(node->id) && (node->id->tag & LIB_TAG_MISSING));
}
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index e3bb384ffcc..2f3b229a180 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -5628,7 +5628,7 @@ bool BKE_object_modifier_update_subframe(Depsgraph *depsgraph,
/* skip subframe if object is parented
* to vertex of a dynamic paint canvas */
- if (no_update && (ob->partype == PARVERT1 || ob->partype == PARVERT3)) {
+ if (no_update && (ELEM(ob->partype, PARVERT1, PARVERT3))) {
return false;
}
diff --git a/source/blender/blenlib/intern/boxpack_2d.c b/source/blender/blenlib/intern/boxpack_2d.c
index 4a07f1134d0..cf5831cada5 100644
--- a/source/blender/blenlib/intern/boxpack_2d.c
+++ b/source/blender/blenlib/intern/boxpack_2d.c
@@ -516,7 +516,7 @@ void BLI_box_pack_2d(BoxPack *boxarray, const uint len, float *r_tot_x, float *r
* flag verts on one or both of the boxes
* as being used by checking the width or
* height of both boxes */
- if (vert->tlb && vert->trb && (box == vert->tlb || box == vert->trb)) {
+ if (vert->tlb && vert->trb && (ELEM(box, vert->tlb, vert->trb))) {
if (UNLIKELY(fabsf(vert->tlb->h - vert->trb->h) < EPSILON_MERGE)) {
#ifdef USE_MERGE
# define A (vert->trb->v[TL])
@@ -547,7 +547,7 @@ void BLI_box_pack_2d(BoxPack *boxarray, const uint len, float *r_tot_x, float *r
vert->tlb->v[TR]->free &= ~(TRF | BRF);
}
}
- else if (vert->blb && vert->brb && (box == vert->blb || box == vert->brb)) {
+ else if (vert->blb && vert->brb && (ELEM(box, vert->blb, vert->brb))) {
if (UNLIKELY(fabsf(vert->blb->h - vert->brb->h) < EPSILON_MERGE)) {
#ifdef USE_MERGE
# define A (vert->blb->v[BR])
@@ -579,7 +579,7 @@ void BLI_box_pack_2d(BoxPack *boxarray, const uint len, float *r_tot_x, float *r
}
}
/* Horizontal */
- if (vert->tlb && vert->blb && (box == vert->tlb || box == vert->blb)) {
+ if (vert->tlb && vert->blb && (ELEM(box, vert->tlb, vert->blb))) {
if (UNLIKELY(fabsf(vert->tlb->w - vert->blb->w) < EPSILON_MERGE)) {
#ifdef USE_MERGE
# define A (vert->blb->v[TL])
@@ -610,7 +610,7 @@ void BLI_box_pack_2d(BoxPack *boxarray, const uint len, float *r_tot_x, float *r
vert->tlb->v[BL]->free &= ~(BLF | BRF);
}
}
- else if (vert->trb && vert->brb && (box == vert->trb || box == vert->brb)) {
+ else if (vert->trb && vert->brb && (ELEM(box, vert->trb, vert->brb))) {
if (UNLIKELY(fabsf(vert->trb->w - vert->brb->w) < EPSILON_MERGE)) {
#ifdef USE_MERGE
diff --git a/source/blender/blenlib/intern/delaunay_2d.cc b/source/blender/blenlib/intern/delaunay_2d.cc
index 4582ea69d9b..53e881a9fc7 100644
--- a/source/blender/blenlib/intern/delaunay_2d.cc
+++ b/source/blender/blenlib/intern/delaunay_2d.cc
@@ -2274,8 +2274,8 @@ void add_face_constraints(CDT_state<T> *cdt_state,
* making valid BMesh faces. */
int id = cdt_state->need_ids ? f : 0;
add_face_ids(cdt_state, face_symedge0, id, fedge_start, fedge_end);
- if (cdt_state->need_ids || (output_type == CDT_CONSTRAINTS_VALID_BMESH ||
- output_type == CDT_CONSTRAINTS_VALID_BMESH_WITH_HOLES)) {
+ if (cdt_state->need_ids ||
+ ELEM(output_type, CDT_CONSTRAINTS_VALID_BMESH, CDT_CONSTRAINTS_VALID_BMESH_WITH_HOLES)) {
add_face_ids(cdt_state, face_symedge0, f, fedge_start, fedge_end);
}
}
diff --git a/source/blender/blenlib/intern/filereader_gzip.c b/source/blender/blenlib/intern/filereader_gzip.c
index 72eb153a8b9..fe766e5da41 100644
--- a/source/blender/blenlib/intern/filereader_gzip.c
+++ b/source/blender/blenlib/intern/filereader_gzip.c
@@ -64,7 +64,7 @@ static ssize_t gzip_read(FileReader *reader, void *buffer, size_t size)
int ret = inflate(&gzip->strm, Z_NO_FLUSH);
- if (ret != Z_OK && ret != Z_BUF_ERROR) {
+ if (!ELEM(ret, Z_OK, Z_BUF_ERROR)) {
break;
}
}
diff --git a/source/blender/blenlib/intern/noise.cc b/source/blender/blenlib/intern/noise.cc
index 58b6bb638e9..5fa2746d07f 100644
--- a/source/blender/blenlib/intern/noise.cc
+++ b/source/blender/blenlib/intern/noise.cc
@@ -410,7 +410,7 @@ BLI_INLINE float noise_grad(uint32_t hash, float x, float y, float z)
{
uint32_t h = hash & 15u;
float u = h < 8u ? x : y;
- float vt = ((h == 12u) || (h == 14u)) ? x : z;
+ float vt = ELEM(h, 12u, 14u) ? x : z;
float v = h < 4u ? y : vt;
return negate_if(u, h & 1u) + negate_if(v, h & 2u);
}
diff --git a/source/blender/blenlib/intern/scanfill_utils.c b/source/blender/blenlib/intern/scanfill_utils.c
index ec0f8659395..33c0f4afd01 100644
--- a/source/blender/blenlib/intern/scanfill_utils.c
+++ b/source/blender/blenlib/intern/scanfill_utils.c
@@ -156,15 +156,13 @@ static ScanFillEdge *edge_step(PolyInfo *poly_info,
eed = (e_curr->next && e_curr !=
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list