[Bf-blender-cvs] [49aeab23d77] temp-gpu-compute-shader-hair: Reverted unneeded changes in vertex shader.
Jeroen Bakker
noreply at git.blender.org
Tue May 11 11:37:41 CEST 2021
Commit: 49aeab23d77cb652c11b461229ee4820378901a4
Author: Jeroen Bakker
Date: Tue May 11 11:31:07 2021 +0200
Branches: temp-gpu-compute-shader-hair
https://developer.blender.org/rB49aeab23d77cb652c11b461229ee4820378901a4
Reverted unneeded changes in vertex shader.
===================================================================
M source/blender/draw/intern/shaders/common_hair_refine_vert.glsl
===================================================================
diff --git a/source/blender/draw/intern/shaders/common_hair_refine_vert.glsl b/source/blender/draw/intern/shaders/common_hair_refine_vert.glsl
index 7b33bfa6859..371d43827b9 100644
--- a/source/blender/draw/intern/shaders/common_hair_refine_vert.glsl
+++ b/source/blender/draw/intern/shaders/common_hair_refine_vert.glsl
@@ -1,7 +1,5 @@
-/*
- * To be compiled with common_hair_lib.glsl.
- */
+/* To be compiled with common_hair_lib.glsl */
out vec4 finalColor;
@@ -18,9 +16,7 @@ void main(void)
hair_get_interp_attrs(data0, data1, data2, data3, interp_time);
vec4 weights = hair_get_weights_cardinal(interp_time);
- vec4 result = hair_interp_data(data0, data1, data2, data3, weights);
-
- finalColor = result;
+ finalColor = hair_interp_data(data0, data1, data2, data3, weights);
#ifdef TF_WORKAROUND
int id = gl_VertexID - idOffset;
More information about the Bf-blender-cvs
mailing list