[Bf-blender-cvs] [0820ee4a04e] cycles_texture_cache: Cycles: Use texture cache only for CPU devices

[Stefan Werner]

Commit: 0820ee4a04ea97381495705e39d742bade8badcd
Author: Stefan Werner
Date:   Fri May 5 11:55:22 2017 +0200
Branches: cycles_texture_cache
https://developer.blender.org/rB0820ee4a04ea97381495705e39d742bade8badcd

Cycles: Use texture cache only for CPU devices

===================================================================

M	intern/cycles/render/shader.cpp

===================================================================

diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 91705b2f339..ce645c1ffe0 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -426,7 +426,7 @@ void ShaderManager::device_update_common(Device *device,
                                          Progress& /*progress*/)
 {
 	dscene->shader_flag.free();
-	if(scene->params.shadingsystem == SHADINGSYSTEM_OSL || scene->params.texture_cache_size > 0) {
+	if(device->info.type == DEVICE_CPU && (scene->params.shadingsystem == SHADINGSYSTEM_OSL || scene->params.texture_cache_size > 0)) {
 		/* set texture system */
 		scene->image_manager->set_oiio_texture_system((void*)ts);
 		OIIOGlobals *oiio_globals = (OIIOGlobals*)device->oiio_memory();