Commit: 3eabe064ab5401b9f0267c0a4a31379541084610
Author: Brecht Van Lommel
Date: Sat Mar 1 14:57:25 2014 +0100
https://developer.blender.org/rB3eabe064ab5401b9f0267c0a4a31379541084610
Fix T38900: cycles OSL crash running getmessage("trace", "geom:name", name)
===================================================================
M intern/cycles/kernel/osl/osl_services.cpp
===================================================================
diff --git a/intern/cycles/kernel/osl/osl_services.cpp
b/intern/cycles/kernel/osl/osl_services.cpp
index 4fad66b..58858c3 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -1001,6 +1001,7 @@ bool OSLRenderServices::trace(TraceOpt &options,
OSL::ShaderGlobals *sg,
tracedata->ray = ray;
tracedata->setup = false;
tracedata->init = true;
+ tracedata->sd.osl_globals = sd->osl_globals;
/* raytrace */
#ifdef __HAIR__
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
