[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30631] trunk/blender/source/blender/ render/intern/source: committed wrong version of this file

[Matt Ebb]

Revision: 30631
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30631
Author:   broken
Date:     2010-07-22 14:02:39 +0200 (Thu, 22 Jul 2010)

Log Message:
-----------
committed wrong version of this file

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/volume_precache.c
    trunk/blender/source/blender/render/intern/source/volumetric.c

Modified: trunk/blender/source/blender/render/intern/source/volume_precache.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/volume_precache.c	2010-07-22 11:54:12 UTC (rev 30630)
+++ trunk/blender/source/blender/render/intern/source/volume_precache.c	2010-07-22 12:02:39 UTC (rev 30631)
@@ -700,7 +700,6 @@
 		vp = NULL;
 		return;
 	}
-	//obi->volume_precache = vp;
 
 	/* Need a shadeinput to calculate scattering */
 	precache_setup_shadeinput(re, obi, ma, &shi);

Modified: trunk/blender/source/blender/render/intern/source/volumetric.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/volumetric.c	2010-07-22 11:54:12 UTC (rev 30630)
+++ trunk/blender/source/blender/render/intern/source/volumetric.c	2010-07-22 12:02:39 UTC (rev 30631)
@@ -210,7 +210,7 @@
 
 
 /* trilinear interpolation */
-static void vol_get_precached_scattering(ShadeInput *shi, float *scatter_col, float *co)
+static void vol_get_precached_scattering(Render *re, ShadeInput *shi, float *scatter_col, float *co)
 {
 	VolumePrecache *vp = shi->obi->volume_precache;
 	float bbmin[3], bbmax[3], dim[3];