[Bf-blender-cvs] [2e6f914e370] master: Fix debug build error after recent Cycles kernel argument changes
Brecht Van Lommel
noreply at git.blender.org
Mon Nov 29 18:43:58 CET 2021
Commit: 2e6f914e3702ecf8c2dfedb7ad79d980113a43d5
Author: Brecht Van Lommel
Date: Mon Nov 29 18:41:13 2021 +0100
Branches: master
https://developer.blender.org/rB2e6f914e3702ecf8c2dfedb7ad79d980113a43d5
Fix debug build error after recent Cycles kernel argument changes
===================================================================
M intern/cycles/integrator/path_trace_work_gpu.cpp
===================================================================
diff --git a/intern/cycles/integrator/path_trace_work_gpu.cpp b/intern/cycles/integrator/path_trace_work_gpu.cpp
index 5f3d30f09ad..e5062c6c47e 100644
--- a/intern/cycles/integrator/path_trace_work_gpu.cpp
+++ b/intern/cycles/integrator/path_trace_work_gpu.cpp
@@ -485,7 +485,7 @@ void PathTraceWorkGPU::compute_sorted_queued_paths(DeviceKernel kernel,
int d_queued_kernel = queued_kernel;
device_ptr d_counter = (device_ptr)integrator_state_gpu_.sort_key_counter[d_queued_kernel];
device_ptr d_prefix_sum = integrator_shader_sort_prefix_sum_.device_pointer;
- assert(d_counter != nullptr && d_prefix_sum != nullptr);
+ assert(d_counter != 0 && d_prefix_sum != 0);
/* Compute prefix sum of number of active paths with each shader. */
{
More information about the Bf-blender-cvs
mailing list