diff options
author | Campbell Barton <campbell@blender.org> | 2022-09-25 15:41:22 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-09-25 15:41:22 +0300 |
commit | 0419ee871ff960f62e28a2a9fed764f66c616d71 (patch) | |
tree | 4a114edf1d1af726575297e79e0c7f15a806000a /source/blender/draw | |
parent | 21d77a417e17ac92bfc10dbd742c867d4019ce69 (diff) |
Cleanup: remove redundant parenthesis (especially with macros)
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/engines/eevee_next/eevee_light.cc | 4 | ||||
-rw-r--r-- | source/blender/draw/engines/overlay/overlay_gpencil.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/draw/engines/eevee_next/eevee_light.cc b/source/blender/draw/engines/eevee_next/eevee_light.cc index b60246fa3ab..8a5de15229d 100644 --- a/source/blender/draw/engines/eevee_next/eevee_light.cc +++ b/source/blender/draw/engines/eevee_next/eevee_light.cc @@ -154,8 +154,8 @@ float Light::attenuation_radius_get(const ::Light *la, float light_threshold, fl void Light::shape_parameters_set(const ::Light *la, const float scale[3]) { if (la->type == LA_AREA) { - float area_size_y = (ELEM(la->area_shape, LA_AREA_RECT, LA_AREA_ELLIPSE)) ? la->area_sizey : - la->area_size; + float area_size_y = ELEM(la->area_shape, LA_AREA_RECT, LA_AREA_ELLIPSE) ? la->area_sizey : + la->area_size; _area_size_x = max_ff(0.003f, la->area_size * scale[0] * 0.5f); _area_size_y = max_ff(0.003f, area_size_y * scale[1] * 0.5f); /* For volume point lighting. */ diff --git a/source/blender/draw/engines/overlay/overlay_gpencil.cc b/source/blender/draw/engines/overlay/overlay_gpencil.cc index f72bf81bf57..7e59a513437 100644 --- a/source/blender/draw/engines/overlay/overlay_gpencil.cc +++ b/source/blender/draw/engines/overlay/overlay_gpencil.cc @@ -96,7 +96,7 @@ void OVERLAY_edit_gpencil_cache_init(OVERLAY_Data *vedata) (GPENCIL_EDIT_MODE(gpd) && (ts->gpencil_selectmode_edit != GP_SELECTMODE_STROKE)); - if ((!GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd)) && + if (!GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd) && ((!GPENCIL_VERTEX_MODE(gpd) && !GPENCIL_PAINT_MODE(gpd)) || use_vertex_mask)) { DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_BLEND_ALPHA; |