diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-02 19:04:25 +0400 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-02 19:04:25 +0400 |
commit | fd553c5b7bdfd5bec1cc005bc67785c54916a64a (patch) | |
tree | 35dc06e8085b1ede7208fc545f9919426583e217 /source/blender/nodes/shader/nodes/node_shader_tex_environment.c | |
parent | 6137ae29c110c755e7892d28bf7052fb319aa746 (diff) |
Fix T37334: Better "internal links" function for muting and node disconnect.
Implements a more flexible internal connect function for standard nodes
(compositor, shader, texture). Allow feasible datatype connections by
priority.
The priorities for common datatypes in compositor, shader and texture
nodes are encoded in a simple function. Certain impossible connections
(e.g. color -> cycles shader) are excluded by giving them -1 priority.
Priority overrides link status: If a higher priority input can be found,
this will be used regardless of link status. Link status only comes into
play for inputs with same priority.
Reviewers: brecht
CC: sebastian_k
Differential Revision: https://developer.blender.org/D356
Diffstat (limited to 'source/blender/nodes/shader/nodes/node_shader_tex_environment.c')
-rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tex_environment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c index 5e6471eab77..dcb3ef3c8a0 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c @@ -37,7 +37,7 @@ static bNodeSocketTemplate sh_node_tex_environment_in[] = { }; static bNodeSocketTemplate sh_node_tex_environment_out[] = { - { SOCK_RGBA, 0, N_("Color"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, + { SOCK_RGBA, 0, N_("Color"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE, SOCK_NO_INTERNAL_LINK}, { -1, 0, "" } }; |