diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-04 21:55:05 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-04 21:55:05 +0300 |
commit | 4a9b912b968175edecd1fc374fe1903e1757b3a1 (patch) | |
tree | b9cfdd600707c915f7bb2b05def93d0358653c15 /intern | |
parent | 6566013c913e033fdabac4f1efb46bf08342b4df (diff) |
Fix T42411: Camera inside volume + particle dupli (object/group) doesn't work
The issue was caused by missing current object instance initialization after
object was ignored for instance push.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/geom/geom_bvh_volume.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/kernel/geom/geom_bvh_volume.h b/intern/cycles/kernel/geom/geom_bvh_volume.h index 9dd8d226f5b..16c16beee39 100644 --- a/intern/cycles/kernel/geom/geom_bvh_volume.h +++ b/intern/cycles/kernel/geom/geom_bvh_volume.h @@ -277,6 +277,7 @@ ccl_device bool BVH_FUNCTION_NAME(KernelGlobals *kg, } else { /* pop */ + object = OBJECT_NONE; nodeAddr = traversalStack[stackPtr]; --stackPtr; } |