From d4e540dff398c8a438ecdd0d13f9de9acc07f46c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 8 May 2011 10:29:40 +0000 Subject: comment some unused code. --- source/blender/render/intern/source/rayshade.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/render/intern/source/rayshade.c') diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index b57fe5a8c3b..74ec52c5dbf 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -1729,7 +1729,7 @@ int ray_trace_shadow_rad(ShadeInput *ship, ShadeResult *shr) /* end warning! - Campbell */ shade_ray(&isec, &shi, &shr_t); - fac= isec.dist*isec.dist; + /* fac= isec.dist*isec.dist; */ fac= 1.0f; accum[0]+= fac*(shr_t.diff[0]+shr_t.spec[0]); accum[1]+= fac*(shr_t.diff[1]+shr_t.spec[1]); -- cgit v1.2.3 From eabb4441061401245f4e12de7c54f9c46c7b3826 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 10 May 2011 13:11:36 +0000 Subject: minor cleanup: make functions static, use NULL for pointer comparisons, also fixed a possible bug assigning incorrect DPX function types to imbuf. --- source/blender/render/intern/source/rayshade.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/render/intern/source/rayshade.c') diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index 74ec52c5dbf..e8f66cf18ef 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -96,7 +96,7 @@ static void RE_rayobject_config_control(RayObject *r, Render *re) } } -RayObject* RE_rayobject_create(Render *re, int type, int size) +static RayObject* RE_rayobject_create(Render *re, int type, int size) { RayObject * res = NULL; @@ -1679,7 +1679,7 @@ static void ray_trace_shadow_tra(Isect *is, ShadeInput *origshi, int depth, int /* not used, test function for ambient occlusion (yaf: pathlight) */ /* main problem; has to be called within shading loop, giving unwanted recursion */ -int ray_trace_shadow_rad(ShadeInput *ship, ShadeResult *shr) +static int ray_trace_shadow_rad(ShadeInput *ship, ShadeResult *shr) { static int counter=0, only_one= 0; extern float hashvectf[]; -- cgit v1.2.3 From 11014defdb8cf93fb339e2442a93fbc2525586fa Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 20 Jun 2011 15:17:02 +0000 Subject: since render branch isnt planned to be merged now, enable strict warning flags for cmake and tag unused vars. --- source/blender/render/intern/source/rayshade.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/render/intern/source/rayshade.c') diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index e8f66cf18ef..34d3adcf15b 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -1231,7 +1231,7 @@ static QMCSampler *get_thread_qmcsampler(Render *re, int thread, int type, int t return qsa; } -static void release_thread_qmcsampler(Render *re, int thread, QMCSampler *qsa) +static void release_thread_qmcsampler(Render *UNUSED(re), int UNUSED(thread), QMCSampler *qsa) { qsa->used= 0; } -- cgit v1.2.3