[Bf-blender-cvs] [f8d2dc1a83] temp_cycles_split_kernel: Cycles: Fix crash after failed kernel build
Mai Lavelle
noreply at git.blender.org
Tue Mar 7 12:03:01 CET 2017
Commit: f8d2dc1a83bf1a576c048494d779b74e869fc6a5
Author: Mai Lavelle
Date: Sat Mar 4 03:29:03 2017 -0500
Branches: temp_cycles_split_kernel
https://developer.blender.org/rBf8d2dc1a83bf1a576c048494d779b74e869fc6a5
Cycles: Fix crash after failed kernel build
Pointers to kernels were uninitialized leading to freeing of random memory
addresses. Another reason it would be good to use smart pointers.
===================================================================
M intern/cycles/device/device_split_kernel.cpp
===================================================================
diff --git a/intern/cycles/device/device_split_kernel.cpp b/intern/cycles/device/device_split_kernel.cpp
index 13fee6c02e..f16fb6a1ea 100644
--- a/intern/cycles/device/device_split_kernel.cpp
+++ b/intern/cycles/device/device_split_kernel.cpp
@@ -31,6 +31,17 @@ DeviceSplitKernel::DeviceSplitKernel(Device *device) : device(device)
first_tile = true;
avg_time_per_sample = 0.0;
+
+ kernel_path_init = NULL;
+ kernel_scene_intersect = NULL;
+ kernel_lamp_emission = NULL;
+ kernel_queue_enqueue = NULL;
+ kernel_background_buffer_update = NULL;
+ kernel_shader_eval = NULL;
+ kernel_holdout_emission_blurring_pathtermination_ao = NULL;
+ kernel_direct_lighting = NULL;
+ kernel_shadow_blocked = NULL;
+ kernel_next_iteration_setup = NULL;
}
DeviceSplitKernel::~DeviceSplitKernel()
More information about the Bf-blender-cvs
mailing list