[Bf-blender-cvs] [4a9b912] master: Fix T42411: Camera inside volume + particle dupli (object/group) doesn't work

[Sergey Sharybin]

Commit: 4a9b912b968175edecd1fc374fe1903e1757b3a1
Author: Sergey Sharybin
Date:   Tue Nov 4 19:55:05 2014 +0100
Branches: master
https://developer.blender.org/rB4a9b912b968175edecd1fc374fe1903e1757b3a1

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.

===================================================================

M	intern/cycles/kernel/geom/geom_bvh_volume.h

===================================================================

diff --git a/intern/cycles/kernel/geom/geom_bvh_volume.h b/intern/cycles/kernel/geom/geom_bvh_volume.h
index 9dd8d22..16c16be 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;
 					}