diff options
| author | Matt Ebb <matt@mke3.net> | 2010-07-22 16:02:39 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-07-22 16:02:39 +0400 |
| commit | f5d7fc6da5faddbf6a15d924c36d077fe6eb13e2 (patch) | |
| tree | 8b21050b5c52b19c25ca82bf788345227149848c /source/blender | |
| parent | 5d2e08cdee2bf5fd546a08eef4bdcbcc2f63d665 (diff) | |
committed wrong version of this file
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/render/intern/source/volume_precache.c | 1 | ||||
| -rw-r--r-- | source/blender/render/intern/source/volumetric.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c index b94a9770876..d3e8f4058c5 100644 --- a/source/blender/render/intern/source/volume_precache.c +++ b/source/blender/render/intern/source/volume_precache.c @@ -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); diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c index 0a26677f7e6..af456185daf 100644 --- a/source/blender/render/intern/source/volumetric.c +++ b/source/blender/render/intern/source/volumetric.c @@ -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]; |