diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-01-25 00:10:37 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-01-25 00:10:37 +0400 |
| commit | c905415f6bf498ebf0351aae040ea52983a5b36e (patch) | |
| tree | 7676bd2f57dfb3f0a8d55f41f947444eedbc0e0d | |
| parent | 439e9a39a8dd16076648d8e3eaa6a721ce349a57 (diff) | |
Cycles Node Editor:
* Add Use Nodes button for World shader type
* UI was not redrawing the Node area, when enabling "Use nodes", added check for it to the listener.
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_node/space_node.c | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index f44c04e36f8..763cff0bd7d 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -241,7 +241,7 @@ class CyclesCamera_PT_dof(CyclesButtonsPanel, Panel): class Cycles_PT_context_material(CyclesButtonsPanel, Panel): - bl_label = "Surface" + bl_label = "" bl_context = "material" bl_options = {'HIDE_HEADER'} diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index e1a599dca2e..f875fab415f 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -61,6 +61,7 @@ class NODE_HT_header(Header): if snode.shader_type == 'WORLD': layout.template_ID(scene, "world", new="world.new") + layout.prop(snode_id, "use_nodes") elif snode.tree_type == 'TEXTURE': layout.prop(snode, "texture_type", text="", expand=True) diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 9d4c5705bd1..a00b1d1d2dc 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -214,6 +214,11 @@ static void node_area_listener(ScrArea *sa, wmNotifier *wmn) ED_area_tag_refresh(sa); } break; + case NC_WORLD: + if(type==NTREE_SHADER) { + ED_area_tag_refresh(sa); + } + break; case NC_OBJECT: if(type==NTREE_SHADER) { if(wmn->data==ND_OB_SHADING) |