[Bf-blender-cvs] [cf19012] master: Fix T44831: Crash when using Intel OpenCL with split kernel

Sergey Sharybin noreply at git.blender.org
Tue May 26 18:29:31 CEST 2015


Commit: cf19012fb0f61f4b1af6c05d3fbce9649a56147c
Author: Sergey Sharybin
Date:   Tue May 26 21:08:21 2015 +0500
Branches: master
https://developer.blender.org/rBcf19012fb0f61f4b1af6c05d3fbce9649a56147c

Fix T44831: Crash when using Intel OpenCL with split kernel

The issue was caused by underallocation of object motion related arrays,
which happened by accident.

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

M	intern/cycles/device/device_opencl.cpp

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

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 2f9f9af..72224d3 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -2329,7 +2329,7 @@ public:
 			/* Object motion. */
 			ob_tfm_sd = mem_alloc(num_global_elements * sizeof(Transform));
 			ob_tfm_sd_DL_shadow = mem_alloc(num_global_elements * 2 * sizeof(Transform));
-			ob_itfm_sd = mem_alloc(num_global_elements * sizeof(float3));
+			ob_itfm_sd = mem_alloc(num_global_elements * sizeof(Transform));
 			ob_itfm_sd_DL_shadow = mem_alloc(num_global_elements * 2 * sizeof(Transform));
 
 			closure_sd = mem_alloc(num_global_elements * ShaderClosure_size);




More information about the Bf-blender-cvs mailing list