diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-05-19 02:40:21 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-05-19 02:40:21 +0400 |
| commit | d12a5d8d63282da6e1f554a50ebbe24649f7b350 (patch) | |
| tree | 44cd71899716b68af1df86f898b921cde6158db4 /intern/cycles/kernel/osl/osl_services.cpp | |
| parent | fa043d208b2060694eda02aee7807d530be367e5 (diff) | |
Cycles:
* Fix OSL compilation for scene_intersect(), when __Hair__ was disabled.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_services.cpp')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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 } |