[Bf-blender-cvs] [daff3c442fb] blender2.8: Fix mistake in previous GLSL cleanup commit.
Brecht Van Lommel
noreply at git.blender.org
Thu Apr 19 19:38:25 CEST 2018
Commit: daff3c442fb1483b8c31c48e81c27e81c1a43261
Author: Brecht Van Lommel
Date: Thu Apr 19 19:35:36 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBdaff3c442fb1483b8c31c48e81c27e81c1a43261
Fix mistake in previous GLSL cleanup commit.
===================================================================
M source/blender/gpu/shaders/gpu_shader_material.glsl
===================================================================
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index ca04ebcc3ed..45701f090fa 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -898,6 +898,11 @@ void texco_norm(vec3 normal, out vec3 outnormal)
outnormal = normalize(normal);
}
+vec3 mtex_2d_mapping(vec3 vec)
+{
+ return vec3(vec.xy * 0.5 + vec2(0.5), vec.z);
+}
+
/** helper method to extract the upper left 3x3 matrix from a 4x4 matrix */
mat3 to_mat3(mat4 m4)
{
@@ -1205,6 +1210,9 @@ void node_subsurface_scattering(
#else
result.sss_data.rgb *= color.rgb;
#endif
+#else
+ node_bsdf_diffuse(color, 0.0, N, result);
+#endif
}
void node_bsdf_refraction(vec4 color, float roughness, float ior, vec3 N, out Closure result)
More information about the Bf-blender-cvs
mailing list