diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-31 20:21:30 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-31 20:21:30 +0400 |
| commit | 966e004bbea6304840cd73f262d91a5e65464e5f (patch) | |
| tree | b9d4a9e233e471e2fa143e27b26058d6093c9d56 /intern/cycles/render/osl.cpp | |
| parent | fc68daff582664bc1ccba57b9408973c5e8d83ec (diff) | |
Cycles: OSL build & image manager fixes.
Diffstat (limited to 'intern/cycles/render/osl.cpp')
| -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 068ae883930..446cf72f5d6 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -44,9 +44,6 @@ CCL_NAMESPACE_BEGIN OSLShaderManager::OSLShaderManager() { - /* todo: verify if we are leaking shaders - * todo: verify if we are leaking image cache memory */ - services = new OSLRenderServices(); /* if we let OSL create it, it leaks */ @@ -112,6 +109,9 @@ void OSLShaderManager::device_update(Device *device, DeviceScene *dscene, Scene foreach(Shader *shader, scene->shaders) shader->need_update = false; + + /* set texture system */ + scene->image_manager->set_osl_texture_system((void*)ts); } void OSLShaderManager::device_free(Device *device, DeviceScene *dscene) |