Merge branch 'master' into asset-greasepencilasset-greasepencil

1 files changed, 4 insertions, 4 deletions

diff --git a/intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu b/intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu
index 3bd57bc0f1a..41e6224f6da 100644
--- a/intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu
+++ b/intern/cycles/kernel/device/optix/kernel_shader_raytrace.cu
@@ -11,15 +11,15 @@
 extern "C" __global__ void __raygen__kernel_optix_integrator_shade_surface_raytrace()
 {
   const int global_index = optixGetLaunchIndex().x;
-  const int path_index = (__params.path_index_array) ? __params.path_index_array[global_index] :
+  const int path_index = (kernel_params.path_index_array) ? kernel_params.path_index_array[global_index] :
                                                        global_index;
-  integrator_shade_surface_raytrace(nullptr, path_index, __params.render_buffer);
+  integrator_shade_surface_raytrace(nullptr, path_index, kernel_params.render_buffer);
 }
 
 extern "C" __global__ void __raygen__kernel_optix_integrator_shade_surface_mnee()
 {
   const int global_index = optixGetLaunchIndex().x;
-  const int path_index = (__params.path_index_array) ? __params.path_index_array[global_index] :
+  const int path_index = (kernel_params.path_index_array) ? kernel_params.path_index_array[global_index] :
                                                        global_index;
-  integrator_shade_surface_mnee(nullptr, path_index, __params.render_buffer);
+  integrator_shade_surface_mnee(nullptr, path_index, kernel_params.render_buffer);
 }