Revision: 39858
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39858
Author: campbellbarton
Date: 2011-09-02 03:32:57 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
minor warning fixes, also correct some float -> double promotions in
shadeoutput.c
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/sound.c
trunk/blender/source/blender/render/intern/source/shadeoutput.c
trunk/blender/source/tests/check_deprecated.py
Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c 2011-09-02
00:53:00 UTC (rev 39857)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c 2011-09-02
03:32:57 UTC (rev 39858)
@@ -341,7 +341,7 @@
}
/* Add a NLA Strip referencing the given speaker's sound */
-NlaStrip *add_nla_soundstrip (Scene *scene, Speaker *speaker)
+NlaStrip *add_nla_soundstrip (Scene *UNUSED(scene), Speaker *speaker)
{
NlaStrip *strip = MEM_callocN(sizeof(NlaStrip), "NlaSoundStrip");
@@ -359,6 +359,8 @@
#endif
{
strip->end = 10.0f;
+ /* quiet compiler warnings */
+ (void)speaker;
}
/* general settings */
Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c 2011-09-02
00:53:00 UTC (rev 39857)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c 2011-09-02
03:32:57 UTC (rev 39858)
@@ -39,8 +39,10 @@
#include "BKE_sequencer.h"
#include "BKE_scene.h"
+#ifdef WITH_AUDASPACE
// evil global ;-)
static int sound_cfra;
+#endif
struct bSound* sound_new_file(struct Main *bmain, const char *filename)
{
Modified: trunk/blender/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeoutput.c
2011-09-02 00:53:00 UTC (rev 39857)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c
2011-09-02 03:32:57 UTC (rev 39858)
@@ -282,10 +282,10 @@
else if(ok1==0 || ok2==0) return;
/* at least 1 visible interesction point */
- if(t1<0.0f && t2<0.0f) return;
+ if(t1<0.0 && t2<0.0) return;
- if(t1<0.0f) t1= 0.0f;
- if(t2<0.0f) t2= 0.0f;
+ if(t1<0.0) t1= 0.0;
+ if(t2<0.0) t2= 0.0;
if(t1==t2) return;
@@ -423,8 +423,8 @@
static double saacos_d(double fac)
{
- if(fac<= -1.0f) return M_PI;
- else if(fac>=1.0f) return 0.0;
+ if(fac<= -1.0) return M_PI;
+ else if(fac>=1.0) return 0.0;
else return acos(fac);
}
@@ -590,7 +590,7 @@
i= spec(nh, hard);
- i= i/(0.1+nv);
+ i= i/(0.1f+nv);
return i;
}
@@ -896,7 +896,7 @@
if(ma->ramp_col) {
if(ma->rampin_col==MA_RAMP_IN_RESULT) {
- fac= 0.3*diff[0] + 0.58*diff[1] + 0.12*diff[2];
+ fac= 0.3f*diff[0] + 0.58f*diff[1] + 0.12f*diff[2];
do_colorband(ma->ramp_col, fac, col);
/* blending method */
@@ -926,7 +926,7 @@
/* input */
switch(ma->rampin_col) {
case MA_RAMP_IN_ENERGY:
- fac= 0.3*r + 0.58*g + 0.12*b;
+ fac= 0.3f*r + 0.58f*g + 0.12f*b;
break;
case MA_RAMP_IN_SHADER:
fac= is;
@@ -966,7 +966,7 @@
float fac;
if(ma->ramp_spec && (ma->rampin_spec==MA_RAMP_IN_RESULT)) {
- fac= 0.3*(*specr) + 0.58*(*specg) + 0.12*(*specb);
+ fac= 0.3f*(*specr) + 0.58f*(*specg) + 0.12f*(*specb);
do_colorband(ma->ramp_spec, fac, col);
/* blending method */
@@ -1213,7 +1213,7 @@
}
}
}
- if (visifac <= 0.001) visifac = 0.0f;
+ if (visifac <= 0.001f) visifac = 0.0f;
return visifac;
}
}
@@ -1231,7 +1231,7 @@
view= shi->view;
- if (lar->energy == 0.0) return;
+ if (lar->energy == 0.0f) return;
/* only shadow lamps shouldn't affect shadow-less materials at all */
if ((lar->mode & LA_ONLYSHADOW) && (!(ma->mode & MA_SHADOW) ||
!(R.r.mode & R_SHADOW)))
return;
@@ -1359,7 +1359,7 @@
/* 'is' is diffuse */
if((ma->shade_flag & MA_CUBIC) && is>0.0f && is<1.0f)
- is= 3.0*is*is - 2.0*is*is*is; // nicer termination of shades
+ is= 3.0f*is*is - 2.0f*is*is*is; // nicer termination of shades
i= is*phongcorr;
@@ -1388,7 +1388,7 @@
lamp_get_shadow(lar, shi, inp,
shadfac, shi->depth);
/* warning, here it skips the loop */
- if((lar->mode & LA_ONLYSHADOW) &&
i>0.0) {
+ if((lar->mode & LA_ONLYSHADOW) &&
i>0.0f) {
shadfac[3]=
i*lar->energy*(1.0f-shadfac[3]);
shr->shad[0] -=
shadfac[3]*shi->r*(1.0f-lashdw[0]);
@@ -1448,7 +1448,7 @@
t= vn[0]*lv[0]+vn[1]*lv[1]+vn[2]*lv[2];
if(lar->type==LA_HEMI) {
- t= 0.5*t+0.5;
+ t= 0.5f*t+0.5f;
}
t= shadfac[3]*shi->spec*spec(t, shi->har);
Modified: trunk/blender/source/tests/check_deprecated.py
===================================================================
--- trunk/blender/source/tests/check_deprecated.py 2011-09-02 00:53:00 UTC
(rev 39857)
+++ trunk/blender/source/tests/check_deprecated.py 2011-09-02 03:32:57 UTC
(rev 39858)
@@ -130,7 +130,7 @@
def main():
import datetime
- now = datetime.datetime.now()\
+ now = datetime.datetime.now()
deps = deprecations()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
