Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2009-10-07 03:05:53 +0400
committerMatt Ebb <matt@mke3.net>2009-10-07 03:05:53 +0400
commit91400d9da862caf74ccdaf8389d5bc5ce9de506a (patch)
treeb2f793c2ac6c221a2d7dcaaf7c7aae02aa7e5412 /source/blender/render
parent46402ccddc84895a1be167be2421d260f24d4972 (diff)
* Fix for crash with new raytree
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/volumetric.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c
index 91c13207da8..90ac45edb60 100644
--- a/source/blender/render/intern/source/volumetric.c
+++ b/source/blender/render/intern/source/volumetric.c
@@ -139,12 +139,16 @@ static int vol_get_bounds(ShadeInput *shi, float *co, float *vec, float *hitco,
*/
isect->mode= RE_RAY_MIRROR;
- isect->orig.ob = (void*)shi->obi;
isect->last_hit = NULL;
isect->lay= -1;
- if (intersect_type == VOL_BOUNDS_DEPTH) isect->orig.face = (void*)shi->vlr;
- else if (intersect_type == VOL_BOUNDS_SS) isect->orig.face= NULL;
+ if (intersect_type == VOL_BOUNDS_DEPTH) {
+ isect->orig.face = (void*)shi->vlr;
+ isect->orig.ob = (void*)shi->obi;
+ } else if (intersect_type == VOL_BOUNDS_SS) {
+ isect->orig.face= NULL;
+ isect->orig.ob = NULL;
+ }
if(RE_rayobject_raycast(R.raytree, isect))
{