From 4a9b912b968175edecd1fc374fe1903e1757b3a1 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Tue, 4 Nov 2014 19:55:05 +0100
Subject: 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.
---
 intern/cycles/kernel/geom/geom_bvh_volume.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'intern')

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;
 					}
-- 
cgit v1.2.3