diff options
| author | Thomas Dinges <blender@dingto.org> | 2015-01-28 03:07:59 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2015-01-28 03:07:59 +0300 |
| commit | 01cebb6e91dce40772a1f9444a09eef7ba97ea7b (patch) | |
| tree | a130d038b1d19594682b39f8b3519bc33a4a99e8 /intern | |
| parent | 7b16fda3799d5b7167ef7ffe533d654810f44e36 (diff) | |
OSL: Updates for OSL 1.5 API changes.
* create() and destroy() are deprecated since OSL 1.5, use regular constructors / destructors.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/osl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 7b22d200a9e..45b4d283c07 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -189,7 +189,7 @@ void OSLShaderManager::shading_system_init() if(ss_shared_users == 0) { services_shared = new OSLRenderServices(); - ss_shared = OSL::ShadingSystem::create(services_shared, ts_shared, &errhandler); + ss_shared = new OSL::ShadingSystem(services_shared, ts_shared, &errhandler); ss_shared->attribute("lockgeom", 1); ss_shared->attribute("commonspace", "world"); ss_shared->attribute("searchpath:shader", path_get("shader")); @@ -238,7 +238,7 @@ void OSLShaderManager::shading_system_free() ss_shared_users--; if(ss_shared_users == 0) { - OSL::ShadingSystem::destroy(ss_shared); + delete ss_shared; ss_shared = NULL; delete services_shared; @@ -270,7 +270,7 @@ bool OSLShaderManager::osl_compile(const string& inputfile, const string& output stdosl_path = path_get("shader/stdosl.h"); /* compile */ - OSL::OSLCompiler *compiler = OSL::OSLCompiler::create(); + OSL::OSLCompiler *compiler = new OSL::OSLCompiler(); bool ok = compiler->compile(string_view(inputfile), options, string_view(stdosl_path)); delete compiler; |