Cycles:

* Fix OSL compilation for scene_intersect(), when __Hair__ was disabled.
2013-05-18 22:40:21 +00:00
parent fa043d208b
commit d12a5d8d63
1 changed files with 4 additions and 0 deletions
--- 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
 }