diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-11-07 20:36:49 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-11-07 20:36:49 +0400 |
| commit | edec46b0a6aac18f406991b9e16228d4bd848c61 (patch) | |
| tree | 1240768d737c63705fdb38c9832d926ed0bcda94 /source/blender/editors/space_node/node_edit.c | |
| parent | 2ed6f077b3952123d56916980d18a379ecb3e5ac (diff) | |
| parent | 4d7a9e5c055fd3903162b61fdd40fb77b2b96793 (diff) | |
Merge with trunk r41625
Diffstat (limited to 'source/blender/editors/space_node/node_edit.c')
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index c1e50c112fa..745611c6251 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -2207,8 +2207,14 @@ bNode *node_add_node(SpaceNode *snode, Main *bmain, Scene *scene, bNodeTemplate ED_node_set_active(bmain, snode->edittree, node); if(snode->nodetree->type==NTREE_COMPOSIT) { - if(ELEM4(node->type, CMP_NODE_R_LAYERS, CMP_NODE_COMPOSITE, CMP_NODE_DEFOCUS, CMP_NODE_OUTPUT_FILE)) + if(ELEM4(node->type, CMP_NODE_R_LAYERS, CMP_NODE_COMPOSITE, CMP_NODE_DEFOCUS, CMP_NODE_OUTPUT_FILE)) { node->id = &scene->id; + } + else if(ELEM3(node->type, CMP_NODE_MOVIECLIP, CMP_NODE_MOVIEDISTORTION, CMP_NODE_STABILIZE2D)) { + if(G.main->movieclip.first == G.main->movieclip.last) { + node->id= G.main->movieclip.first; + } + } ntreeCompositForceHidden(snode->edittree, scene); } |