committed wrong version of this file
authorMatt Ebb <matt@mke3.net>
Thu, 22 Jul 2010 12:02:39 +0000 (12:02 +0000)
committerMatt Ebb <matt@mke3.net>
Thu, 22 Jul 2010 12:02:39 +0000 (12:02 +0000)
source/blender/render/intern/source/volume_precache.c
source/blender/render/intern/source/volumetric.c

index b94a9770876fe70cf81168ed1ac31da91dd09549..d3e8f4058c5de0d24124a31428341a5c77cf24b4 100644 (file)
@@ -700,7 +700,6 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat
                vp = NULL;
                return;
        }
-       //obi->volume_precache = vp;
 
        /* Need a shadeinput to calculate scattering */
        precache_setup_shadeinput(re, obi, ma, &shi);
index 0a26677f7e6bf11f5cbf0df9e3b88c8e92f0ad05..af456185daf8e48b1a345c6ae0afd6458cbd4b10 100644 (file)
@@ -210,7 +210,7 @@ static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, float *co, float *co
 
 
 /* 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];