[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37667] trunk/blender/source/blender/ render: since render branch isnt planned to be merged now, enable strict warning flags for cmake and tag unused vars.
Campbell Barton
ideasman42 at gmail.com
Mon Jun 20 17:17:02 CEST 2011
Revision: 37667
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37667
Author: campbellbarton
Date: 2011-06-20 15:17:02 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
since render branch isnt planned to be merged now, enable strict warning flags for cmake and tag unused vars.
Modified Paths:
--------------
trunk/blender/source/blender/render/CMakeLists.txt
trunk/blender/source/blender/render/intern/include/rayobject.h
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/rayshade.c
trunk/blender/source/blender/render/intern/source/rendercore.c
trunk/blender/source/blender/render/intern/source/renderdatabase.c
trunk/blender/source/blender/render/intern/source/shadeinput.c
trunk/blender/source/blender/render/intern/source/shadeoutput.c
trunk/blender/source/blender/render/intern/source/strand.c
trunk/blender/source/blender/render/intern/source/zbuf.c
Modified: trunk/blender/source/blender/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/render/CMakeLists.txt 2011-06-20 14:32:36 UTC (rev 37666)
+++ trunk/blender/source/blender/render/CMakeLists.txt 2011-06-20 15:17:02 UTC (rev 37667)
@@ -24,8 +24,6 @@
#
# ***** END GPL LICENSE BLOCK *****
-# remove warning until render branch merged.
-remove_strict_flags()
set(INC
intern/include
Modified: trunk/blender/source/blender/render/intern/include/rayobject.h
===================================================================
--- trunk/blender/source/blender/render/intern/include/rayobject.h 2011-06-20 14:32:36 UTC (rev 37666)
+++ trunk/blender/source/blender/render/intern/include/rayobject.h 2011-06-20 15:17:02 UTC (rev 37667)
@@ -60,7 +60,7 @@
RayObject* RE_rayobject_octree_create(int ocres, int size);
RayObject* RE_rayobject_instance_create(RayObject *target, float transform[][4], void *ob, void *target_ob);
-RayObject* RE_rayobject_empty_create();
+RayObject* RE_rayobject_empty_create(void);
RayObject* RE_rayobject_blibvh_create(int size); /* BLI_kdopbvh.c */
RayObject* RE_rayobject_vbvh_create(int size); /* raytrace/rayobject_vbvh.c */
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c 2011-06-20 14:32:36 UTC (rev 37666)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c 2011-06-20 15:17:02 UTC (rev 37667)
@@ -341,7 +341,7 @@
/* ------------------------------------------------------------------------- */
-static void split_v_renderfaces(ObjectRen *obr, int startvlak, int startvert, int usize, int vsize, int uIndex, int UNUSED(cyclu), int cyclv)
+static void split_v_renderfaces(ObjectRen *obr, int startvlak, int UNUSED(startvert), int UNUSED(usize), int vsize, int uIndex, int UNUSED(cyclu), int cyclv)
{
int vLen = vsize-1+(!!cyclv);
int v;
@@ -393,7 +393,7 @@
acc[1]+= 1.0f;
}
-static void calc_edge_stress(Render *re, ObjectRen *obr, Mesh *me)
+static void calc_edge_stress(Render *UNUSED(re), ObjectRen *obr, Mesh *me)
{
float loc[3], size[3], *accum, *acc, *accumoffs, *stress;
int a;
@@ -590,7 +590,7 @@
}
}
-static void calc_vertexnormals(Render *re, ObjectRen *obr, int do_tangent, int do_nmap_tangent)
+static void calc_vertexnormals(Render *UNUSED(re), ObjectRen *obr, int do_tangent, int do_nmap_tangent)
{
MemArena *arena= NULL;
VertexTangent **vtangents= NULL;
@@ -759,7 +759,7 @@
}
}
-static int as_testvertex(VlakRen *vlr, VertRen *ver, ASvert *asv, float thresh)
+static int as_testvertex(VlakRen *vlr, VertRen *UNUSED(ver), ASvert *asv, float thresh)
{
/* return 1: vertex needs a copy */
ASface *asf;
@@ -782,7 +782,7 @@
return 0;
}
-static VertRen *as_findvertex(VlakRen *vlr, VertRen *ver, ASvert *asv, float thresh)
+static VertRen *as_findvertex(VlakRen *vlr, VertRen *UNUSED(ver), ASvert *asv, float thresh)
{
/* return when new vertex already was made */
ASface *asf;
@@ -810,7 +810,7 @@
/* note; autosmooth happens in object space still, after applying autosmooth we rotate */
/* note2; actually, when original mesh and displist are equal sized, face normals are from original mesh */
-static void autosmooth(Render *re, ObjectRen *obr, float mat[][4], int degr)
+static void autosmooth(Render *UNUSED(re), ObjectRen *obr, float mat[][4], int degr)
{
ASvert *asv, *asverts;
ASface *asf;
@@ -2100,7 +2100,7 @@
/* Halo's */
/* ------------------------------------------------------------------------- */
-static void make_render_halos(Render *re, ObjectRen *obr, Mesh *me, int totvert, MVert *mvert, Material *ma, float *orco)
+static void make_render_halos(Render *re, ObjectRen *obr, Mesh *UNUSED(me), int totvert, MVert *mvert, Material *ma, float *orco)
{
Object *ob= obr->ob;
HaloRen *har;
@@ -4699,7 +4699,7 @@
return 1;
}
-static int allow_render_dupli_instance(Render *re, DupliObject *dob, Object *obd)
+static int allow_render_dupli_instance(Render *UNUSED(re), DupliObject *dob, Object *obd)
{
ParticleSystem *psys;
Material *ma;
Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c 2011-06-20 14:32:36 UTC (rev 37666)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c 2011-06-20 15:17:02 UTC (rev 37667)
@@ -1231,7 +1231,7 @@
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;
}
Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c 2011-06-20 14:32:36 UTC (rev 37666)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c 2011-06-20 15:17:02 UTC (rev 37667)
@@ -1984,7 +1984,7 @@
short *do_update;
} BakeShade;
-static void bake_set_shade_input(ObjectInstanceRen *obi, VlakRen *vlr, ShadeInput *shi, int quad, int isect, int x, int y, float u, float v)
+static void bake_set_shade_input(ObjectInstanceRen *obi, VlakRen *vlr, ShadeInput *shi, int quad, int UNUSED(isect), int x, int y, float u, float v)
{
if(quad)
shade_input_set_triangle_i(shi, obi, vlr, 0, 2, 3);
@@ -2015,7 +2015,7 @@
shi->view[2]= shi->vn[2];
}
-static void bake_shade(void *handle, Object *ob, ShadeInput *shi, int quad, int x, int y, float u, float v, float *tvn, float *ttang)
+static void bake_shade(void *handle, Object *ob, ShadeInput *shi, int UNUSED(quad), int x, int y, float UNUSED(u), float UNUSED(v), float *tvn, float *ttang)
{
BakeShade *bs= handle;
ShadeSample *ssamp= &bs->ssamp;
@@ -2183,7 +2183,7 @@
}
}
-static void bake_displacement(void *handle, ShadeInput *shi, float dist, int x, int y)
+static void bake_displacement(void *handle, ShadeInput *UNUSED(shi), float dist, int x, int y)
{
BakeShade *bs= handle;
float disp;
@@ -2556,7 +2556,7 @@
return NULL;
}
-void RE_bake_ibuf_filter(ImBuf *ibuf, unsigned char *mask, const int filter)
+void RE_bake_ibuf_filter(ImBuf *ibuf, unsigned char *UNUSED(mask), const int filter)
{
/* must check before filtering */
const short is_new_alpha= (ibuf->depth != 32) && BKE_alphatest_ibuf(ibuf);
Modified: trunk/blender/source/blender/render/intern/source/renderdatabase.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/renderdatabase.c 2011-06-20 14:32:36 UTC (rev 37666)
+++ trunk/blender/source/blender/render/intern/source/renderdatabase.c 2011-06-20 15:17:02 UTC (rev 37667)
@@ -446,7 +446,7 @@
return vlr1;
}
-void RE_vlakren_get_normal(Render *re, ObjectInstanceRen *obi, VlakRen *vlr, float *nor)
+void RE_vlakren_get_normal(Render *UNUSED(re), ObjectInstanceRen *obi, VlakRen *vlr, float *nor)
{
float (*nmat)[3]= obi->nmat;
@@ -1238,7 +1238,7 @@
- shadow buffering (shadbuf.c)
*/
-void project_renderdata(Render *re, void (*projectfunc)(float *, float mat[][4], float *), int do_pano, float xoffs, int do_buckets)
+void project_renderdata(Render *re, void (*projectfunc)(float *, float mat[][4], float *), int do_pano, float xoffs, int UNUSED(do_buckets))
{
ObjectRen *obr;
HaloRen *har = NULL;
Modified: trunk/blender/source/blender/render/intern/source/shadeinput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeinput.c 2011-06-20 14:32:36 UTC (rev 37666)
+++ trunk/blender/source/blender/render/intern/source/shadeinput.c 2011-06-20 15:17:02 UTC (rev 37667)
@@ -303,7 +303,7 @@
*/
/* copy data from face to ShadeInput, scanline case */
-void shade_input_set_triangle(ShadeInput *shi, volatile int obi, volatile int facenr, int normal_flip)
+void shade_input_set_triangle(ShadeInput *shi, volatile int obi, volatile int facenr, int UNUSED(normal_flip))
{
if(facenr>0) {
shi->obi= &R.objectinstance[obi];
Modified: trunk/blender/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeoutput.c 2011-06-20 14:32:36 UTC (rev 37666)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c 2011-06-20 15:17:02 UTC (rev 37667)
@@ -705,7 +705,7 @@
}
/* cartoon render diffuse */
-static float Toon_Diff( float *n, float *l, float *v, float size, float smooth )
+static float Toon_Diff( float *n, float *l, float *UNUSED(v), float size, float smooth )
{
float rslt, ang;
@@ -806,7 +806,7 @@
return i;
}
-static float Fresnel_Diff(float *vn, float *lv, float *view, float fac_i, float fac)
+static float Fresnel_Diff(float *vn, float *lv, float *UNUSED(view), float fac_i, float fac)
{
return fresnel_fac(lv, vn, fac_i, fac);
}
Modified: trunk/blender/source/blender/render/intern/source/strand.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/strand.c 2011-06-20 14:32:36 UTC (rev 37666)
+++ trunk/blender/source/blender/render/intern/source/strand.c 2011-06-20 15:17:02 UTC (rev 37667)
@@ -594,7 +594,7 @@
}
/* width is calculated in hoco space, to ensure strands are visible */
-static int strand_test_clip(float winmat[][4], ZSpan *zspan, float *bounds, float *co, float *zcomp, float widthx, float widthy)
+static int strand_test_clip(float winmat[][4], ZSpan *UNUSED(zspan), float *bounds, float *co, float *zcomp, float widthx, float widthy)
{
float hoco[4];
int clipflag= 0;
@@ -615,7 +615,7 @@
return clipflag;
}
-static void do_scanconvert_strand(Render *re, StrandPart *spart, ZSpan *zspan, float t, float dt, float *co1, float *co2, float *co3, float *co4, int sample)
+static void do_scanconvert_strand(Render *UNUSED(re), StrandPart *spart, ZSpan *zspan, float t, float dt, float *co1, float *co2, float *co3, float *co4, int sample)
{
float jco1[3], jco2[3], jco3[3], jco4[3], jx, jy;
@@ -778,7 +778,7 @@
}
/* render call to fill in strands */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list