[Bf-blender-cvs] [d44ea88] master: Fix T47201: Cycles+OSL keeps image files open until Blender exits
Sergey Sharybin
noreply at git.blender.org
Tue Jan 19 10:57:01 CET 2016
Commit: d44ea880ea447ff5c7bf05af83f533901f9c12d6
Author: Sergey Sharybin
Date: Tue Jan 19 14:55:40 2016 +0500
Branches: master
https://developer.blender.org/rBd44ea880ea447ff5c7bf05af83f533901f9c12d6
Fix T47201: Cycles+OSL keeps image files open until Blender exits
Now image will be opened for while render session is active, this is
needed to keep image cache working correctly. But stopping render
should now release all files descriptors.
===================================================================
M intern/cycles/render/osl.cpp
===================================================================
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index f81fc40..022db16 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -186,7 +186,7 @@ void OSLShaderManager::texture_system_free()
ts_shared_users--;
if(ts_shared_users == 0) {
- OSL::TextureSystem::destroy(ts_shared);
+ OSL::TextureSystem::destroy(ts_shared, true);
ts_shared = NULL;
}
More information about the Bf-blender-cvs
mailing list