[Bf-blender-cvs] [17a958459bf] cycles-x: Cycles X: Fix crash with Subsurface Scatter GLSL shader after anisotropic commit.
Thomas Dinges
noreply at git.blender.org
Sun Aug 22 16:54:14 CEST 2021
Commit: 17a958459bf462109dee488c13e88a33b2116e01
Author: Thomas Dinges
Date: Sun Aug 22 16:51:33 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB17a958459bf462109dee488c13e88a33b2116e01
Cycles X: Fix crash with Subsurface Scatter GLSL shader after anisotropic commit.
7811c1147230 reintroduced paramaters that were removed in 9187156ab65c.
===================================================================
M source/blender/gpu/shaders/material/gpu_shader_material_subsurface_scattering.glsl
===================================================================
diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_subsurface_scattering.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_subsurface_scattering.glsl
index 8109e51d024..d0c159cdf37 100644
--- a/source/blender/gpu/shaders/material/gpu_shader_material_subsurface_scattering.glsl
+++ b/source/blender/gpu/shaders/material/gpu_shader_material_subsurface_scattering.glsl
@@ -5,11 +5,9 @@ CLOSURE_EVAL_FUNCTION_DECLARE_1(node_subsurface_scattering, Diffuse)
void node_subsurface_scattering(vec4 color,
float scale,
vec3 radius,
- float sharpen,
- float texture_blur,
- vec3 N,
float ior,
float anisotropy,
+ vec3 N,
float sss_id,
out Closure result)
{
@@ -30,5 +28,5 @@ void node_subsurface_scattering(vec4 color,
#else
/* Stub subsurface scattering because it is not compatible with volumetrics. */
-# define node_subsurface_scattering(a, b, c, d, e, f, g, h, i, j) (j = CLOSURE_DEFAULT)
+# define node_subsurface_scattering(a, b, c, d, e, f, g, h) (h = CLOSURE_DEFAULT)
#endif
More information about the Bf-blender-cvs
mailing list