[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43677] trunk/blender: Cycles Node Editor:

Thomas Dinges blender at dingto.org
Tue Jan 24 21:10:45 CET 2012


Revision: 43677
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43677
Author:   dingto
Date:     2012-01-24 20:10:37 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
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.  

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py
    trunk/blender/release/scripts/startup/bl_ui/space_node.py
    trunk/blender/source/blender/editors/space_node/space_node.c

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2012-01-24 19:57:34 UTC (rev 43676)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2012-01-24 20:10:37 UTC (rev 43677)
@@ -241,7 +241,7 @@
 
 
 class Cycles_PT_context_material(CyclesButtonsPanel, Panel):
-    bl_label = "Surface"
+    bl_label = ""
     bl_context = "material"
     bl_options = {'HIDE_HEADER'}
 

Modified: trunk/blender/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_node.py	2012-01-24 19:57:34 UTC (rev 43676)
+++ trunk/blender/release/scripts/startup/bl_ui/space_node.py	2012-01-24 20:10:37 UTC (rev 43677)
@@ -61,6 +61,7 @@
                     
             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)

Modified: trunk/blender/source/blender/editors/space_node/space_node.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/space_node.c	2012-01-24 19:57:34 UTC (rev 43676)
+++ trunk/blender/source/blender/editors/space_node/space_node.c	2012-01-24 20:10:37 UTC (rev 43677)
@@ -214,6 +214,11 @@
 					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)




More information about the Bf-blender-cvs mailing list