[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16622] trunk/blender/source/blender/ render/intern: Fix for gcc compiler warning about a call to do_lamp_tex() resulting in "overflow in implicit constant conversion"

[Joshua Leung]

Revision: 16622
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16622
Author:   aligorith
Date:     2008-09-20 11:17:40 +0200 (Sat, 20 Sep 2008)

Log Message:
-----------
Fix for gcc compiler warning about a call to do_lamp_tex() resulting in "overflow in implicit constant conversion"

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/include/texture.h
    trunk/blender/source/blender/render/intern/source/texture.c

Modified: trunk/blender/source/blender/render/intern/include/texture.h
===================================================================
--- trunk/blender/source/blender/render/intern/include/texture.h	2008-09-20 04:37:10 UTC (rev 16621)
+++ trunk/blender/source/blender/render/intern/include/texture.h	2008-09-20 09:17:40 UTC (rev 16622)
@@ -55,7 +55,7 @@
 void do_halo_tex(struct HaloRen *har, float xn, float yn, float *colf);
 void do_sky_tex(float *rco, float *lo, float *dxyview, float *hor, float *zen, float *blend, int skyflag);
 void do_material_tex(struct ShadeInput *shi);
-void do_lamp_tex(LampRen *la, float *lavec, struct ShadeInput *shi, float *colf, short effect);
+void do_lamp_tex(LampRen *la, float *lavec, struct ShadeInput *shi, float *colf, int effect);
 
 void init_render_textures(Render *re);
 

Modified: trunk/blender/source/blender/render/intern/source/texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/texture.c	2008-09-20 04:37:10 UTC (rev 16621)
+++ trunk/blender/source/blender/render/intern/source/texture.c	2008-09-20 09:17:40 UTC (rev 16622)
@@ -2301,7 +2301,7 @@
 /* ------------------------------------------------------------------------- */
 /* colf supposed to be initialized with la->r,g,b */
 
-void do_lamp_tex(LampRen *la, float *lavec, ShadeInput *shi, float *colf, short effect)
+void do_lamp_tex(LampRen *la, float *lavec, ShadeInput *shi, float *colf, int effect)
 {
 	Object *ob;
 	MTex *mtex;