sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles:

Browse Source 
* Fix OSL compilation for scene_intersect(), when __Hair__ was disabled.
This commit is contained in:
Thomas Dinges 2013-05-18 22:40:21 +00:00
parent fa043d208b
commit d12a5d8d63
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/osl/osl_services.cpp
View 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
}