Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2011-02-26 16:53:15 +0300
committerTon Roosendaal <ton@blender.org>2011-02-26 16:53:15 +0300
commit38bd8dcf05aa8d22cc97ba08eec4f7a4b858f696 (patch)
tree387e412444ff6b5c417b0f408a9e891386ffdca6 /source/blender/blenkernel/intern/node.c
parent457aba9d1bb39ccc4cbddc8f4a9fbaf17ad40d38 (diff)
Bugfix #26221
Two bugs in one: - Lukas commit monday for new group/socket handling accidentally removed to set socketype in stacks, which as used by (texture) nodes to detect whether value, color or vector had to be read. Result was that all texture nodes were rendering as B&W - Old 2.5 bug: preview renders for texture nodes didn't call a NodeEndExec function, which gave crashes on deleting nodes. The change in interface_hanlers.c is only a comment to explain how keymaps are being found.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
-rw-r--r--source/blender/blenkernel/intern/node.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 15ad3a7809a..320bead1c61 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -2318,8 +2318,15 @@ void ntreeBeginExecTree(bNodeTree *ntree)
for(sock= node->inputs.first; sock; sock= sock->next) {
ns = get_socket_stack(ntree->stack, sock, NULL);
- if (ns)
+ if (ns) {
ns->hasoutput = 1;
+
+ /* sock type is needed to detect rgba or value or vector types */
+ if(sock->link)
+ ns->sockettype= sock->link->fromsock->type;
+ else
+ sock->ns.sockettype= sock->type;
+ }
if(sock->link) {
bNodeLink *link= sock->link;