main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Showing only changes of commit fee6238d33 - Show all commits

View File

@ -92,6 +92,10 @@ class ColorRampShaderNode : public ShaderNode {
GPU_uniform(&color_band->data[0].r), GPU_uniform(&color_band->data[0].r),
GPU_uniform(&color_band->data[1].r)); GPU_uniform(&color_band->data[1].r));
return; return;
case COLBAND_INTERP_B_SPLINE:
case COLBAND_INTERP_CARDINAL:
/* Not optimized yet. Fallback to gradient texture. */
break;
default: default:
BLI_assert_unreachable(); BLI_assert_unreachable();
return; return;