diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-02 09:54:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-02 09:54:04 +0300 |
| commit | 6470056a0d1ed1a07c823d46ea292d69d3c2a8fb (patch) | |
| tree | d0aebdd1981fba294408cdda08e799e7f0e525e0 /source/blender/draw/engines | |
| parent | 17c15798c35f33e4150beacb0f7b612bcef90c3e (diff) | |
Cleanup: empty expression statement warning
Diffstat (limited to 'source/blender/draw/engines')
4 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index 9de01bf140b..e276fcd63ce 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -119,14 +119,14 @@ static void eevee_create_shader_downsample(void) GPU_ATTACHMENT_NONE, \ GPU_ATTACHMENT_TEXTURE(tex), \ }); \ -} +} ((void)0) #define CLEANUP_BUFFER(tex, fb, fb_color) { \ /* Cleanup to release memory */ \ DRW_TEXTURE_FREE_SAFE(tex); \ GPU_FRAMEBUFFER_FREE_SAFE(fb); \ GPU_FRAMEBUFFER_FREE_SAFE(fb_color); \ -} +} ((void)0) void EEVEE_effects_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, Object *camera, const bool minimal) { diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c index d5c322356d8..812af1c6ac0 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.c +++ b/source/blender/draw/engines/eevee/eevee_lightcache.c @@ -984,15 +984,15 @@ static bool eevee_lightbake_cube_comp(EEVEE_LightProbe *prb_a, EEVEE_LightProbe bool sorted = false; \ while (!sorted) { \ sorted = true; \ - for (int i = 0; i < (elems_len) - 1; ++i) { \ - if ((comp_fn)((elems) + i, (elems) + i+1)) { \ - SWAP(elems_type, (elems)[i], (elems)[i+1]); \ - SWAP(LightProbe *, (prbs)[i], (prbs)[i+1]); \ + for (int i = 0; i < (elems_len) - 1; i++) { \ + if ((comp_fn)((elems) + i, (elems) + i + 1)) { \ + SWAP(elems_type, (elems)[i], (elems)[i + 1]); \ + SWAP(LightProbe *, (prbs)[i], (prbs)[i + 1]); \ sorted = false; \ } \ } \ } \ -} +} ((void)0) static void eevee_lightbake_gather_probes(EEVEE_LightBake *lbake) { diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c index 07be0ad750d..e563fa8b9ce 100644 --- a/source/blender/draw/engines/eevee/eevee_render.c +++ b/source/blender/draw/engines/eevee/eevee_render.c @@ -616,7 +616,7 @@ void EEVEE_render_update_passes(RenderEngine *engine, Scene *scene, ViewLayer *v else if (channels == 3) type = SOCK_VECTOR; \ else type = SOCK_FLOAT; \ RE_engine_register_pass(engine, scene, view_layer, RE_PASSNAME_ ## name, channels, chanid, type); \ - } + } ((void)0) CHECK_PASS(Z, 1, "Z"); CHECK_PASS(MIST, 1, "Z"); diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h index 860dd728805..8af74ec7451 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.h +++ b/source/blender/draw/engines/gpencil/gpencil_engine.h @@ -459,7 +459,7 @@ void GPENCIL_render_to_image(void *vedata, struct RenderEngine *engine, struct R GPU_framebuffer_clear_color_depth(fbl->multisample_fb, (const float[4]){0.0f}, 1.0f); \ DRW_stats_query_end(); \ } \ -} +} ((void)0) #define MULTISAMPLE_GP_SYNC_DISABLE(lvl, fbl, fb, txl) { \ if ((lvl > 0) && (fbl->multisample_fb != NULL)) { \ @@ -468,7 +468,7 @@ void GPENCIL_render_to_image(void *vedata, struct RenderEngine *engine, struct R DRW_multisamples_resolve(txl->multisample_depth, txl->multisample_color, true); \ DRW_stats_query_end(); \ } \ -} +} ((void)0) #define GPENCIL_3D_DRAWMODE(ob, gpd) \ ((gpd) && (gpd->draw_mode == GP_DRAWMODE_3D) && \ |