diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-24 20:37:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-24 20:37:40 +0400 |
| commit | 25b677787fcef7a02fdfa4f45b923e25bc28fccd (patch) | |
| tree | beed2f36910dc719049b68de862b0e3144ec319b /source/blender/editors/space_node | |
| parent | ebd39522d89a6f5d1b5ae58342cb1a3b28ebd714 (diff) | |
| parent | da710b3e14e75db10f336009a9d32c187c632042 (diff) | |
svn merge ^/trunk/blender -r46966:46979
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/node_templates.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index bd79b9dde00..ee3827428bc 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -175,7 +175,8 @@ static void node_socket_add_replace(Main *bmain, bNodeTree *ntree, bNode *node_t node_from = NULL; if (node_prev && node_prev->type == ntemp->type && - (ntemp->type != NODE_GROUP || node_prev->id == &ntemp->ngroup->id)) { + (ntemp->type != NODE_GROUP || node_prev->id == &ntemp->ngroup->id)) + { /* keep the previous node if it's the same type */ node_from = node_prev; } |