[Bf-blender-cvs] [e977b010235] cycles-x: Fix error loading non-existent shadow kernel pass after recent changes
Brecht Van Lommel
noreply at git.blender.org
Wed Jul 14 18:54:39 CEST 2021
Commit: e977b010235e010f8e614da39ac66e2c374e83a4
Author: Brecht Van Lommel
Date: Wed Jul 14 18:43:06 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBe977b010235e010f8e614da39ac66e2c374e83a4
Fix error loading non-existent shadow kernel pass after recent changes
===================================================================
M intern/cycles/device/device_kernel.cpp
M intern/cycles/kernel/kernel_types.h
===================================================================
diff --git a/intern/cycles/device/device_kernel.cpp b/intern/cycles/device/device_kernel.cpp
index ca918c2f853..535e1df7c22 100644
--- a/intern/cycles/device/device_kernel.cpp
+++ b/intern/cycles/device/device_kernel.cpp
@@ -85,7 +85,6 @@ const char *device_kernel_as_string(DeviceKernel kernel)
FILM_CONVERT_KERNEL_AS_STRING(MIST, mist)
FILM_CONVERT_KERNEL_AS_STRING(SAMPLE_COUNT, sample_count)
FILM_CONVERT_KERNEL_AS_STRING(FLOAT, float)
- FILM_CONVERT_KERNEL_AS_STRING(SHADOW, shadow)
FILM_CONVERT_KERNEL_AS_STRING(DIVIDE_EVEN_COLOR, divide_even_color)
FILM_CONVERT_KERNEL_AS_STRING(FLOAT3, float3)
FILM_CONVERT_KERNEL_AS_STRING(MOTION, motion)
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 51e6d3d21dd..5f229eafe3b 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -1403,7 +1403,6 @@ typedef enum DeviceKernel {
DECLARE_FILM_CONVERT_KERNEL(MIST),
DECLARE_FILM_CONVERT_KERNEL(SAMPLE_COUNT),
DECLARE_FILM_CONVERT_KERNEL(FLOAT),
- DECLARE_FILM_CONVERT_KERNEL(SHADOW),
DECLARE_FILM_CONVERT_KERNEL(DIVIDE_EVEN_COLOR),
DECLARE_FILM_CONVERT_KERNEL(FLOAT3),
DECLARE_FILM_CONVERT_KERNEL(MOTION),
More information about the Bf-blender-cvs
mailing list