diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-01 17:57:25 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-01 17:58:05 +0400 |
| commit | 3eabe064ab5401b9f0267c0a4a31379541084610 (patch) | |
| tree | 59f5ed685327460f88f71bc82d1c647f05745106 | |
| parent | 6b693ab7bf0ed7fdc30cdf7cecf85471aa208e59 (diff) | |
Fix T38900: cycles OSL crash running getmessage("trace", "geom:name", name)
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index 4fad66be6e1..58858c3766e 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__ |