[Bf-blender-cvs] [7c61f79e4da] upstream_cycles_texture_cache: Cycles: Crash fix

Stefan Werner noreply at git.blender.org
Wed Jun 27 14:04:47 CEST 2018


Commit: 7c61f79e4da6739c4b0eadccf36f76bda2494d9b
Author: Stefan Werner
Date:   Wed May 17 16:41:31 2017 +0200
Branches: upstream_cycles_texture_cache
https://developer.blender.org/rB7c61f79e4da6739c4b0eadccf36f76bda2494d9b

Cycles: Crash fix

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

M	intern/cycles/device/device_cpu.cpp

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

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 68a6534c6df..f4f5520a867 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -838,6 +838,13 @@ public:
 #ifdef WITH_OSL
 		OSLShader::thread_init(&kg, &kernel_globals, &osl_globals);
 #endif
+		if(kg.oiio && kg.oiio->tex_sys) {
+			kg.oiio_tdata = kg.oiio->tex_sys->get_perthread_info();
+		}
+		else {
+			kg.oiio_tdata = NULL;
+		}
+
 		for(int sample = 0; sample < task.num_samples; sample++) {
 			for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++)
 				shader_kernel()(&kg,



More information about the Bf-blender-cvs mailing list