Cycles:
authorThomas Dinges <blender@dingto.org>
Sat, 18 May 2013 22:40:21 +0000 (22:40 +0000)
committerThomas Dinges <blender@dingto.org>
Sat, 18 May 2013 22:40:21 +0000 (22:40 +0000)
* Fix OSL compilation for scene_intersect(), when __Hair__ was disabled.

intern/cycles/kernel/osl/osl_services.cpp

index a8d4bc3d8551b739ed6355637d0c2256f8ed10c3..f2311e14c3a2aa19f37bba360aaf4629960c9140 100644 (file)
@@ -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
 }