2.5 - Warning cleanups (for mingw+scons)

Also, made the Outliner's horizontal scrollbar work better for keymaps view. It's still using an approximation of the width, but at least you can scroll now.

5 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/render/intern/include/volume_precache.h b/source/blender/render/intern/include/volume_precache.h
index d8a94c2d560..dbd02759a63 100644
--- a/source/blender/render/intern/include/volume_precache.h
+++ b/source/blender/render/intern/include/volume_precache.h
@@ -31,4 +31,4 @@ void free_volume_precache(Render *re);
 int point_inside_volume_objectinstance(ObjectInstanceRen *obi, float *co);
 int using_lightcache(Material *ma);
 
-#define VOL_MS_TIMESTEP	0.1f
\ No newline at end of file
+#define VOL_MS_TIMESTEP	0.1f
diff --git a/source/blender/render/intern/include/volumetric.h b/source/blender/render/intern/include/volumetric.h
index 543e179bc88..026b4840ea3 100644
--- a/source/blender/render/intern/include/volumetric.h
+++ b/source/blender/render/intern/include/volumetric.h
@@ -44,4 +44,4 @@ void shade_volume_shadow(struct ShadeInput *shi, struct ShadeResult *shr, struct
 #define VOL_BOUNDS_SS		1
 
 #define VOL_SHADE_OUTSIDE	0
-#define VOL_SHADE_INSIDE	1
\ No newline at end of file
+#define VOL_SHADE_INSIDE	1
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index fbc39b61257..5f8cf5504fa 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -324,7 +324,7 @@ void accum_density(void *userdata, int index, float squared_dist)
 {
 	PointDensityRangeData *pdr = (PointDensityRangeData *)userdata;
 	const float dist = (pdr->squared_radius - squared_dist) / pdr->squared_radius * 0.5f;
-	float density;
+	float density = 0.0f;
 	
 	if (pdr->falloff_type == TEX_PD_FALLOFF_STD)
 		density = dist;
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 0e2e3913819..13996905437 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -685,4 +685,4 @@ void shade_volume_inside(ShadeInput *shi, ShadeResult *shr)
 	volume_trace(shi, shr, VOL_SHADE_INSIDE);
 
 	shi->mat = mat_backup;
-}
\ No newline at end of file
+}
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index f1f01f873a5..836faeb05b9 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -162,7 +162,7 @@ void init_frame_smoke(Render *re, VoxelData *vd, Tex *tex)
 	ob= vd->object;
 	
 	/* draw code for smoke */
-	if(md = (ModifierData *)modifiers_findByType(ob, eModifierType_Smoke))
+	if( (md = (ModifierData *)modifiers_findByType(ob, eModifierType_Smoke)) )
 	{
 		SmokeModifierData *smd = (SmokeModifierData *)md;