diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-10 10:05:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-10 10:05:39 +0300 |
| commit | 55c152164f825d9d0fa15dcdd3806818e48c7075 (patch) | |
| tree | daad7b775641ddb5c59d35a04a02335d88c18a55 /source | |
| parent | b9eac0bb44fbb4e8d16a74fab8e0d9bc37bfebd3 (diff) | |
Cleanup: order simple check before function call
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_materials.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_deferred.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 32ec54b1ca6..94e0231c5fe 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -1551,7 +1551,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sld */ bool use_volume_material = (gpumat_array[0] && GPU_material_use_domain_volume(gpumat_array[0])); - if (DRW_state_is_image_render() || ob->dt >= OB_SOLID) { + if ((ob->dt >= OB_SOLID) || DRW_state_is_image_render()) { /* Get per-material split surface */ char *auto_layer_names; int *auto_layer_is_srgb; diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c index f75d385714f..482d7178cb7 100644 --- a/source/blender/draw/engines/workbench/workbench_deferred.c +++ b/source/blender/draw/engines/workbench/workbench_deferred.c @@ -897,7 +897,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob) if (!(DRW_object_visibility_in_active_context(ob) & OB_VISIBLE_SELF)) { return; } - if (!DRW_state_is_image_render() && ob->dt < OB_SOLID) { + if ((ob->dt < OB_SOLID) && !DRW_state_is_image_render()) { return; } |