diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 07:44:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 09:40:50 +0300 |
| commit | 48b1656a6cce6fd7606a671eea9d0d17b67d7445 (patch) | |
| tree | d95ed94cf1d1934c01de44364db7d53ca2262ff3 /source/blender/editors/space_node/node_edit.c | |
| parent | 6e4cb463c44ab57331cda7ded645b4faa573bbb3 (diff) | |
Cleanup: shadowing (editors)
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, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index e4861a713b7..413cdc208dd 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -2438,7 +2438,7 @@ static int node_shader_script_update_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); SpaceNode *snode = CTX_wm_space_node(C); PointerRNA nodeptr = CTX_data_pointer_get_type(C, "node", &RNA_ShaderNodeScript); - bNodeTree *ntree = NULL; + bNodeTree *ntree_base = NULL; bNode *node = NULL; RenderEngine *engine; RenderEngineType *type; @@ -2451,17 +2451,17 @@ static int node_shader_script_update_exec(bContext *C, wmOperator *op) /* get node */ if (nodeptr.data) { - ntree = nodeptr.id.data; + ntree_base = nodeptr.id.data; node = nodeptr.data; } else if (snode && snode->edittree) { - ntree = snode->edittree; + ntree_base = snode->edittree; node = nodeGetActive(snode->edittree); } if (node) { /* update single node */ - type->update_script_node(engine, ntree, node); + type->update_script_node(engine, ntree_base, node); found = true; } |