diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-20 12:28:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-20 12:30:19 +0300 |
commit | bbc5c1e36fc93e33fce4156f5064dfebe1129a57 (patch) | |
tree | d0631e65978720ce2eba8deede13ba0cc76821dc /source/blender/render | |
parent | 20bc30706b9c810ea774d98a768734767f9e91be (diff) |
Cleanup: quiet extra-semicolon warning
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/include/texture.h | 6 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h index d783263c8b8..0dd517ed177 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -31,7 +31,8 @@ texres->tin = 0.0f; \ else if (texres->tin > 1.0f) \ texres->tin = 1.0f; \ - } + } \ + ((void)0) #define BRICONTRGB \ texres->tr = tex->rfac * ((texres->tr - 0.5f) * tex->contrast + tex->bright - 0.5f); \ @@ -58,7 +59,8 @@ if (texres->tb < 0.0f) \ texres->tb = 0.0f; \ } \ - } + } \ + ((void)0) struct ImBuf; struct Image; diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 091525602ce..ef99972aa6a 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2864,8 +2864,10 @@ RenderPass *RE_pass_find_by_name(volatile RenderLayer *rl, const char *name, con RenderPass *RE_pass_find_by_type(volatile RenderLayer *rl, int passtype, const char *viewname) { #define CHECK_PASS(NAME) \ - if (passtype == SCE_PASS_##NAME) \ - return RE_pass_find_by_name(rl, RE_PASSNAME_##NAME, viewname); + if (passtype == SCE_PASS_##NAME) { \ + return RE_pass_find_by_name(rl, RE_PASSNAME_##NAME, viewname); \ + } \ + ((void)0) CHECK_PASS(COMBINED); CHECK_PASS(Z); |