forked from bartvdbraak/blender
Cycles:
* Fix OSL compilation for scene_intersect(), when __Hair__ was disabled.
This commit is contained in:
parent
fa043d208b
commit
d12a5d8d63
@ -865,7 +865,11 @@ bool OSLRenderServices::trace(TraceOpt &options, OSL::ShaderGlobals *sg,
|
|||||||
tracedata->init = true;
|
tracedata->init = true;
|
||||||
|
|
||||||
/* raytrace */
|
/* raytrace */
|
||||||
|
#ifdef __HAIR__
|
||||||
return scene_intersect(sd->osl_globals, &ray, ~0, &tracedata->isect, NULL, 0.0f, 0.0f);
|
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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user