[Bf-blender-cvs] [94a28c98f9e] soc-2019-cycles-procedural: Clean up vector math node.

OmarSquircleArt noreply at git.blender.org
Wed Jun 5 12:57:10 CEST 2019


Commit: 94a28c98f9e0fd06a1027b7cb198475c5ebf5d01
Author: OmarSquircleArt
Date:   Wed Jun 5 12:57:59 2019 +0200
Branches: soc-2019-cycles-procedural
https://developer.blender.org/rB94a28c98f9e0fd06a1027b7cb198475c5ebf5d01

Clean up vector math node.

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

M	source/blender/gpu/shaders/gpu_shader_material.glsl
M	source/blender/nodes/shader/nodes/node_shader_vectMath.c

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

diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 99e55b64f1d..fa60cbc693a 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -552,7 +552,6 @@ void vec_math_length(vec3 v, out vec3 outvec, out float outval)
   outval = length(v);
 }
 
-// temp has to be passed for some reason, see node_shader_vectMath.c
 void vec_math_scale(vec3 v, vec3 temp, float scale, out vec3 outvec, out float outval)
 {
   outvec = v * scale;
diff --git a/source/blender/nodes/shader/nodes/node_shader_vectMath.c b/source/blender/nodes/shader/nodes/node_shader_vectMath.c
index a7b95646033..acffd34c3ee 100644
--- a/source/blender/nodes/shader/nodes/node_shader_vectMath.c
+++ b/source/blender/nodes/shader/nodes/node_shader_vectMath.c
@@ -154,12 +154,6 @@ static int gpu_shader_vect_math(GPUMaterial *mat,
       break;
     }
     case NODE_VECTOR_MATH_SCALE: {
-      // GPUNodeStack tmp_in[3];
-      // memcpy(&tmp_in[0], &in[0], sizeof(GPUNodeStack));
-      // memcpy(&tmp_in[1], &in[2], sizeof(GPUNodeStack));
-      // memcpy(&tmp_in[2], &in[3], sizeof(GPUNodeStack));
-
-      // tmp_in doesn't work if not linked, use `in` for now.
       GPU_stack_link(mat, node, names[node->custom1], in, out);
       break;
     }



More information about the Bf-blender-cvs mailing list