[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22648] branches/volume25/source/blender/ render/intern: * a few more small cleanups

[Matt Ebb]

Revision: 22648
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22648
Author:   broken
Date:     2009-08-20 10:18:54 +0200 (Thu, 20 Aug 2009)

Log Message:
-----------
* a few more small cleanups

Modified Paths:
--------------
    branches/volume25/source/blender/render/intern/include/texture.h
    branches/volume25/source/blender/render/intern/include/volumetric.h
    branches/volume25/source/blender/render/intern/source/pointdensity.c

Modified: branches/volume25/source/blender/render/intern/include/texture.h
===================================================================
--- branches/volume25/source/blender/render/intern/include/texture.h	2009-08-20 05:44:32 UTC (rev 22647)
+++ branches/volume25/source/blender/render/intern/include/texture.h	2009-08-20 08:18:54 UTC (rev 22648)
@@ -56,6 +56,7 @@
 void do_sky_tex(float *rco, float *lo, float *dxyview, float *hor, float *zen, float *blend, int skyflag, short thread);
 void do_material_tex(struct ShadeInput *shi);
 void do_lamp_tex(LampRen *la, float *lavec, struct ShadeInput *shi, float *colf, int effect);
+void do_volume_tex(struct ShadeInput *shi, float *xyz, int mapto_flag, float *col, float *val);
 
 void init_render_textures(Render *re);
 void end_render_textures(void);

Modified: branches/volume25/source/blender/render/intern/include/volumetric.h
===================================================================
--- branches/volume25/source/blender/render/intern/include/volumetric.h	2009-08-20 05:44:32 UTC (rev 22647)
+++ branches/volume25/source/blender/render/intern/include/volumetric.h	2009-08-20 08:18:54 UTC (rev 22648)
@@ -28,7 +28,7 @@
 
 float vol_get_stepsize(struct ShadeInput *shi, int context);
 float vol_get_density(struct ShadeInput *shi, float *co);
-void vol_get_scattering(ShadeInput *shi, float *scatter, float *co, float stepsize, float density);
+void vol_get_scattering(ShadeInput *shi, float *scatter_col, float *co, float stepsize, float density);
 
 void shade_volume_outside(ShadeInput *shi, ShadeResult *shr);
 void shade_volume_inside(ShadeInput *shi, ShadeResult *shr);

Modified: branches/volume25/source/blender/render/intern/source/pointdensity.c
===================================================================
--- branches/volume25/source/blender/render/intern/source/pointdensity.c	2009-08-20 05:44:32 UTC (rev 22647)
+++ branches/volume25/source/blender/render/intern/source/pointdensity.c	2009-08-20 08:18:54 UTC (rev 22648)
@@ -227,10 +227,8 @@
 	}
 	
 	if (pd->source == TEX_PD_PSYS) {
-		ParticleSystem *psys;
 		Object *ob = pd->object;
-		int i;
-		
+
 		if (!ob) return;
 		if (!pd->psys) return;