[Bf-blender-cvs] [e6aefb8699b] cycles_embree: Cycles: fixed Windows build with Embree

Stefan Werner noreply at git.blender.org
Sun Nov 26 23:11:22 CET 2017


Commit: e6aefb8699b7d110c670ed03cf9ccfb8c5e6ef1a
Author: Stefan Werner
Date:   Wed Jun 28 15:21:58 2017 +0200
Branches: cycles_embree
https://developer.blender.org/rBe6aefb8699b7d110c670ed03cf9ccfb8c5e6ef1a

Cycles: fixed Windows build with Embree

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

M	intern/cycles/kernel/bvh/bvh_embree_traversal.h

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

diff --git a/intern/cycles/kernel/bvh/bvh_embree_traversal.h b/intern/cycles/kernel/bvh/bvh_embree_traversal.h
index 8c6d780deba..ef00a554472 100644
--- a/intern/cycles/kernel/bvh/bvh_embree_traversal.h
+++ b/intern/cycles/kernel/bvh/bvh_embree_traversal.h
@@ -38,9 +38,9 @@ struct RTCORE_ALIGN(16) CCLRay : public RTCRay {
 	// for SSS Rays:
 	ccl::LocalIntersection *ss_isect;
 	int sss_object_id;
-	uint *lcg_state;
+	ccl::uint *lcg_state;
 
-	CCLRay(const ccl::Ray& ray, ccl::KernelGlobals *kg_, const uint visibility, RayType type_)
+	CCLRay(const ccl::Ray& ray, ccl::KernelGlobals *kg_, const ccl::uint visibility, RayType type_)
 	{
 		org[0] = ray.P.x;
 		org[1] = ray.P.y;



More information about the Bf-blender-cvs mailing list