diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-11 00:10:03 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-11 00:10:03 +0400 |
| commit | d16a608f6d5cfdb45c0a72aaa7c5cbc0ebe19928 (patch) | |
| tree | dd1df886d084d678d04373c20a5f7edded0bb8cf /source/blender/editors/space_node/node_edit.c | |
| parent | 6322f017835f86e96b8e082f66595debd9de1da9 (diff) | |
Fix cycles backwards compatibility for specular_toon shader this actually needs
to be done in cycles itself to keep compatibility for bytecode too.
Also fix broken button to compile OSL from the text editors, this got broken after
recent change to disable editing of library linked nodes.
Diffstat (limited to 'source/blender/editors/space_node/node_edit.c')
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 8ee09101cdf..89fa58cd750 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -2315,9 +2315,6 @@ static int node_shader_script_update_poll(bContext *C) bNode *node; Text *text; - if (!ED_operator_node_editable(C)) - return 0; - /* test if we have a render engine that supports shaders scripts */ if (!(type && type->update_script_node)) return 0; @@ -2325,14 +2322,14 @@ static int node_shader_script_update_poll(bContext *C) /* see if we have a shader script node in context */ node = CTX_data_pointer_get_type(C, "node", &RNA_ShaderNodeScript).data; - if (!node) + if (!node && snode && snode->edittree) node = nodeGetActive(snode->edittree); if (node && node->type == SH_NODE_SCRIPT) { NodeShaderScript *nss = node->storage; if (node->id || nss->filepath[0]) { - return 1; + return ED_operator_node_editable(C); } } |