diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-02 19:47:15 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-02 19:47:15 +0400 |
| commit | b2a9d012b4e0ce820cb81ce170d84bed143ac041 (patch) | |
| tree | 84bb4469b548206e624497cbadb98a5391312c5f /source/blender/editors/space_node | |
| parent | 1d2e1018f7babf913d2f6d09f921d3137a8999fa (diff) | |
Fix #31236: linking a socket of a different type to an existing node group output
would crash, did not convert default value storage correctly.
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index c0817f9c895..4bbba419613 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -2412,7 +2412,8 @@ static int node_link_modal(bContext *C, wmOperator *op, wmEvent *event) /* when linking to group outputs, update the socket type */ /* XXX this should all be part of a generic update system */ if (!link->tonode) { - link->tosock->type = link->fromsock->type; + if(link->tosock->type != link->fromsock->type) + nodeSocketSetType(link->tosock, link->fromsock->type); } } else if (outside_group_rect(snode) && (link->tonode || link->fromnode)) { |