diff options
Diffstat (limited to 'source/blender/draw/engines')
4 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index 355d156a083..7d1f40ba5d8 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -401,7 +401,7 @@ static void eevee_id_world_update(void *vedata, World *wo) EEVEE_StorageList *stl = ((EEVEE_Data *)vedata)->stl; LightCache *lcache = stl->g_data->light_cache; - if (lcache == NULL || lcache == stl->lookdev_lightcache) { + if (ELEM(lcache, NULL, stl->lookdev_lightcache)) { /* Avoid Lookdev viewport clearing the update flag (see T67741). */ return; } diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c index b7112c07cab..b773049f6f7 100644 --- a/source/blender/draw/engines/eevee/eevee_lights.c +++ b/source/blender/draw/engines/eevee/eevee_lights.c @@ -97,7 +97,7 @@ static float light_shape_power_get(const Light *la, const EEVEE_Light *evli) power *= 4.0f / M_PI; } } - else if (la->type == LA_SPOT || la->type == LA_LOCAL) { + else if (ELEM(la->type, LA_SPOT, LA_LOCAL)) { power = 1.0f / (4.0f * evli->radius * evli->radius * M_PI * M_PI); /* 1/(4*r²*Pi²) */ /* for point lights (a.k.a radius == 0.0) */ diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c index fe3705f1fbb..530becfe771 100644 --- a/source/blender/draw/engines/eevee/eevee_motion_blur.c +++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c @@ -521,8 +521,7 @@ void EEVEE_motion_blur_swap_data(EEVEE_Data *vedata) case EEVEE_MOTION_DATA_MESH: if (mb_geom->batch != NULL) { for (int i = 0; i < GPU_BATCH_VBO_MAX_LEN; i++) { - if (mb_geom->batch->verts[i] == mb_geom->vbo[MB_PREV] || - mb_geom->batch->verts[i] == mb_geom->vbo[MB_NEXT]) { + if (ELEM(mb_geom->batch->verts[i], mb_geom->vbo[MB_PREV], mb_geom->vbo[MB_NEXT])) { /* Avoid double reference of the VBOs. */ mb_geom->batch->verts[i] = NULL; } diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_data.c b/source/blender/draw/engines/gpencil/gpencil_draw_data.c index 4361f6f9b51..18ca2e4ccc9 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_data.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_data.c @@ -371,7 +371,7 @@ static float light_power_get(const Light *la) if (la->type == LA_AREA) { return 1.0f / (4.0f * M_PI); } - if (la->type == LA_SPOT || la->type == LA_LOCAL) { + if (ELEM(la->type, LA_SPOT, LA_LOCAL)) { return 1.0f / (4.0f * M_PI * M_PI); } |