[Bf-blender-cvs] [560c708e61d] cycles_embree: Cycles: Fixed Embree Volume rendering when the camera is inside a volume

[Stefan Werner]

Commit: 560c708e61d52c863dbd3ef9661914568ab9f73d
Author: Stefan Werner
Date:   Wed Nov 8 20:55:30 2017 +0100
Branches: cycles_embree
https://developer.blender.org/rB560c708e61d52c863dbd3ef9661914568ab9f73d

Cycles: Fixed Embree Volume rendering when the camera is inside a volume

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

M	intern/cycles/bvh/bvh_embree.cpp

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

diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp
index 2046db177bd..f0d2fc162e2 100644
--- a/intern/cycles/bvh/bvh_embree.cpp
+++ b/intern/cycles/bvh/bvh_embree.cpp
@@ -151,7 +151,7 @@ void rtc_filter_func(void*, RTCRay& ray_)
 			ray.num_hits++;
 			ray.isect_to_ccl(isect);
 			/* Only primitives from volume object. */
-			uint tri_object = kernel_tex_fetch(__prim_object, isect->prim);
+			uint tri_object = (isect->object == OBJECT_NONE) ?kernel_tex_fetch(__prim_object, isect->prim) : isect->object;
 			int object_flag = kernel_tex_fetch(__object_flag, tri_object);
 			if((object_flag & SD_OBJECT_HAS_VOLUME) == 0) {
 				ray.num_hits--;