From d12a5d8d63282da6e1f554a50ebbe24649f7b350 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sat, 18 May 2013 22:40:21 +0000 Subject: [PATCH] Cycles: * Fix OSL compilation for scene_intersect(), when __Hair__ was disabled. --- intern/cycles/kernel/osl/osl_services.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index a8d4bc3d855..f2311e14c3a 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -865,7 +865,11 @@ bool OSLRenderServices::trace(TraceOpt &options, OSL::ShaderGlobals *sg, tracedata->init = true; /* raytrace */ +#ifdef __HAIR__ return scene_intersect(sd->osl_globals, &ray, ~0, &tracedata->isect, NULL, 0.0f, 0.0f); +#else + return scene_intersect(sd->osl_globals, &ray, ~0, &tracedata->isect); +#endif }