Commit: 01cebb6e91dce40772a1f9444a09eef7ba97ea7b
Author: Thomas Dinges
Date: Wed Jan 28 01:07:59 2015 +0100
Branches: master
https://developer.blender.org/rB01cebb6e91dce40772a1f9444a09eef7ba97ea7b
OSL: Updates for OSL 1.5 API changes.
* create() and destroy() are deprecated since OSL 1.5, use regular constructors
/ destructors.
===================================================================
M intern/cycles/render/osl.cpp
===================================================================
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 7b22d20..45b4d28 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
