[Bf-blender-cvs] [451ca8453b5] blender2.8: GPU: Make node texture "Blend" parameter interactive.
Clément Foucault
noreply at git.blender.org
Wed Nov 7 00:19:54 CET 2018
Commit: 451ca8453b54db6a1e2f9613fe7f2904bccbb011
Author: Clément Foucault
Date: Wed Nov 7 00:19:06 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB451ca8453b54db6a1e2f9613fe7f2904bccbb011
GPU: Make node texture "Blend" parameter interactive.
This parameter is only used for Box projection type.
===================================================================
M source/blender/nodes/shader/nodes/node_shader_tex_image.c
===================================================================
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.c b/source/blender/nodes/shader/nodes/node_shader_tex_image.c
index 0b33b186dd2..9782df2638f 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_image.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.c
@@ -124,7 +124,7 @@ static int node_shader_gpu_tex_image(GPUMaterial *mat, bNode *node, bNodeExecDat
norm,
col1, col2, col3,
GPU_image(ima, iuser, isdata),
- GPU_constant(&blend),
+ GPU_uniform(&blend),
&out[0].link,
&out[1].link);
break;
More information about the Bf-blender-cvs
mailing list