diff options
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 4 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pointdensity.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/volumetric.c | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 8e0dbb457e8..e6478098dad 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -24,6 +24,9 @@ # # ***** END GPL LICENSE BLOCK ***** +# remove warning until render branch merged. +STRING(REGEX REPLACE "-Wunused-parameter" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) + FILE(GLOB SRC intern/source/*.c intern/raytrace/*.cpp) SET(INC diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index ed390fe102a..a2f08d96251 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -861,7 +861,7 @@ static void *ml_addlayer_cb(void *base, char *str) BLI_strncpy(rl->name, str, EXR_LAY_MAXNAME); return rl; } -static void ml_addpass_cb(void *base, void *lay, char *str, float *rect, int totchan, char *chan_id) +static void ml_addpass_cb(void *UNUSED(base), void *lay, char *str, float *rect, int totchan, char *chan_id) { RenderLayer *rl= lay; RenderPass *rpass= MEM_callocN(sizeof(RenderPass), "loaded pass"); @@ -2677,7 +2677,7 @@ static int is_rendering_allowed(Render *re) return 1; } -static void update_physics_cache(Render *re, Scene *scene, int anim_init) +static void update_physics_cache(Render *re, Scene *scene, int UNUSED(anim_init)) { PTCacheBaker baker; diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index 1ca1ea10273..d8156594085 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -253,7 +253,7 @@ static void cache_pointdensity(Render *re, Tex *tex) } } -static void free_pointdensity(Render *re, Tex *tex) +static void free_pointdensity(Render *UNUSED(re), Tex *tex) { PointDensity *pd = tex->pd; diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c index d15ea0c792c..f3f31bf6b43 100644 --- a/source/blender/render/intern/source/volumetric.c +++ b/source/blender/render/intern/source/volumetric.c @@ -358,7 +358,7 @@ void vol_get_sigma_t(ShadeInput *shi, float *sigma_t, float *co) /* phase function - determines in which directions the light * is scattered in the volume relative to incoming direction * and view direction */ -float vol_get_phasefunc(ShadeInput *shi, float g, float *w, float *wp) +float vol_get_phasefunc(ShadeInput *UNUSED(shi), float g, float *w, float *wp) { const float normalize = 0.25f; // = 1.f/4.f = M_PI/(4.f*M_PI) |