Commit: 680994643cf76f3b0643d0fc4d8a32094431c026
Author: Brecht Van Lommel
Date: Sun Jul 15 00:54:12 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB680994643cf76f3b0643d0fc4d8a32094431c026
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/gpu/shaders/gpu_shader_material.glsl
index 3890d7b52cf,ab044fff100..d1183c792f5
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@@ -2290,8 -3660,9 +2290,8 @@@ void node_tex_sky(vec3 co, out vec4 col
color = vec4(1.0);
}
- void node_tex_voronoi(vec3 co, float scale, float coloring, out vec4 color,
out float fac)
+ void node_tex_voronoi(vec3 co, float scale, float exponent, float coloring,
out vec4 color, out float fac)
{
-#ifdef BIT_OPERATIONS
vec3 p = co * scale;
int xx, yy, zz, xi, yi, zi;
float da[4];
diff --cc source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
index 36b6174059a,e5bf8f49717..18d0dee8b88
--- a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
@@@ -63,9 -66,26 +66,26 @@@ static int node_shader_gpu_tex_voronoi(
NodeTexVoronoi *tex = (NodeTexVoronoi *)node->storage;
float coloring = tex->coloring;
- return GPU_stack_link(mat, "node_tex_voronoi", in, out,
GPU_uniform(&coloring));
+ return GPU_stack_link(mat, node, "node_tex_voronoi", in, out,
GPU_uniform(&coloring));
}
+ static void node_shader_update_tex_voronoi(bNodeTree *UNUSED(ntree), bNode
*node)
+ {
+ NodeTexVoronoi *tex = (NodeTexVoronoi *)node->storage;
+ bNodeSocket *sock;
+
+ for (sock = node->inputs.first; sock; sock = sock->next) {
+ if (STREQ(sock->name, "Exponent")) {
+ if (tex->distance == SHD_VORONOI_MINKOWSKI) {
+ sock->flag &= ~SOCK_UNAVAIL;
+ }
+ else {
+ sock->flag |= SOCK_UNAVAIL;
+ }
+ }
+ }
+ }
+
/* node type definition */
void register_node_type_sh_tex_voronoi(void)
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
