diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-11-06 04:30:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-11-06 04:32:54 +0300 |
| commit | aa3a4973a30ff668a62447e18ac41f6c916b4a8b (patch) | |
| tree | 1b24cc55995ba8b3d72aaabd9400a3e1e030d540 /source/blender/draw/intern/draw_cache_impl_particles.c | |
| parent | 7cb20d841da16d0bffb63154403267500e9941f5 (diff) | |
Cleanup: use ELEM macro
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_particles.c')
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_particles.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c index 52d1fcfdb80..75685c7e2f0 100644 --- a/source/blender/draw/intern/draw_cache_impl_particles.c +++ b/source/blender/draw/intern/draw_cache_impl_particles.c @@ -301,12 +301,12 @@ static void particle_calculate_parent_uvs(ParticleSystem *psys, } ParticleData *particle = &psys->particles[parent_index]; int num = particle->num_dmcache; - if (num == DMCACHE_NOTFOUND || num == DMCACHE_ISCHILD) { + if (ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) { if (particle->num < psmd->mesh_final->totface) { num = particle->num; } } - if (num != DMCACHE_NOTFOUND && num != DMCACHE_ISCHILD) { + if (!ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) { MFace *mface = &psmd->mesh_final->mface[num]; for (int j = 0; j < num_uv_layers; j++) { psys_interpolate_uvs(mtfaces[j] + num, mface->v4, particle->fuv, r_uv[j]); @@ -330,12 +330,12 @@ static void particle_calculate_parent_mcol(ParticleSystem *psys, } ParticleData *particle = &psys->particles[parent_index]; int num = particle->num_dmcache; - if (num == DMCACHE_NOTFOUND || num == DMCACHE_ISCHILD) { + if (ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) { if (particle->num < psmd->mesh_final->totface) { num = particle->num; } } - if (num != DMCACHE_NOTFOUND && num != DMCACHE_ISCHILD) { + if (!ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) { MFace *mface = &psmd->mesh_final->mface[num]; for (int j = 0; j < num_col_layers; j++) { /* CustomDataLayer CD_MCOL has 4 structs per face. */ |