[Bf-blender-cvs] [01725d4] strand_gpu: Fix some uninitialized variables, leading to incorrect tangents for strands shading.

Lukas Tönne noreply at git.blender.org
Sun Jul 17 17:04:51 CEST 2016


Commit: 01725d4d52a5c9442076fe4b0075d50b93bbb276
Author: Lukas Tönne
Date:   Sun Jul 17 17:04:23 2016 +0200
Branches: strand_gpu
https://developer.blender.org/rB01725d4d52a5c9442076fe4b0075d50b93bbb276

Fix some uninitialized variables, leading to incorrect tangents for strands shading.

===================================================================

M	source/blender/gpu/shaders/gpu_shader_strand_util.glsl

===================================================================

diff --git a/source/blender/gpu/shaders/gpu_shader_strand_util.glsl b/source/blender/gpu/shaders/gpu_shader_strand_util.glsl
index 773aee8..1e740ec 100644
--- a/source/blender/gpu/shaders/gpu_shader_strand_util.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_strand_util.glsl
@@ -50,8 +50,12 @@ void interpolate_vertex(int fiber_index, float curve_param,
 	vec3 cloc[4], cnor[4], ctang[4];
 	int cnum_verts[4];
 	for (int k = 0; k < 4; ++k) {
-		if (!control_valid[k])
+		if (!control_valid[k]) {
+			cloc[k] = vec3(0.0, 0.0, 0.0);
+			cnor[k] = vec3(0.0, 0.0, 0.0);
+			ctang[k] = vec3(0.0, 0.0, 0.0);
 			continue;
+		}
 
 		uvec2 curve = texelFetch(samplers.control_curves, int(control_index[k])).xy;
 		int verts_begin = int(curve.x);




More information about the Bf-blender-cvs mailing list