[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34583] trunk/blender: Node UI:

[Thomas Dinges]

Revision: 34583
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34583
Author:   dingto
Date:     2011-01-31 16:16:15 +0000 (Mon, 31 Jan 2011)
Log Message:
-----------
Node UI:
* Added Backdrop Panel inside the "Properties" area.
* Hard limit for the "zoom" value. Negative values doesn't make sense. 
* Added a missing notifier for the Node backdrop move operator. 

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_node.py
    trunk/blender/source/blender/editors/space_node/node_edit.c
    trunk/blender/source/blender/makesrna/intern/rna_space.c

Modified: trunk/blender/release/scripts/ui/space_node.py
===================================================================
--- trunk/blender/release/scripts/ui/space_node.py	2011-01-31 15:18:30 UTC (rev 34582)
+++ trunk/blender/release/scripts/ui/space_node.py	2011-01-31 16:16:15 UTC (rev 34583)
@@ -161,8 +161,38 @@
         layout.separator()
 
         layout.operator("node.show_cyclic_dependencies")
+        
+     
+# Node Backdrop options 
+class NODE_PT_properties(bpy.types.Panel):
+    bl_space_type = 'NODE_EDITOR'
+    bl_region_type = 'UI'
+    bl_label = "Backdrop"
 
+    @classmethod
+    def poll(cls, context):
+        snode = context.space_data
+        return snode.tree_type == 'COMPOSITING'
+        
+    def draw_header(self, context):
+        snode = context.space_data
+        self.layout.prop(snode, "show_backdrop", text="")
 
+    def draw(self, context):
+        layout = self.layout
+
+        snode = context.space_data
+        layout.active = snode.show_backdrop
+        layout.prop(snode, "backdrop_channels", text="")
+        layout.prop(snode, "backdrop_zoom", text="Zoom")
+
+        col = layout.column(align=True)
+        col.label(text="Offset:")
+        col.prop(snode, "backdrop_x", text="X")
+        col.prop(snode, "backdrop_y", text="Y")
+        col.operator("node.backimage_move", text="Move")
+
+
 def register():
     pass
 

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2011-01-31 15:18:30 UTC (rev 34582)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2011-01-31 16:16:15 UTC (rev 34583)
@@ -784,6 +784,8 @@
 			
 			MEM_freeN(nvm);
 			op->customdata= NULL;
+            
+			WM_event_add_notifier(C, NC_SPACE|ND_SPACE_NODE, NULL);
 			
 			return OPERATOR_FINISHED;
 	}
@@ -831,6 +833,7 @@
 {
 	/* identifiers */
 	ot->name= "Background Image Move";
+	ot->description = "Move Node backdrop";
 	ot->idname= "NODE_OT_backimage_move";
 	
 	/* api callbacks */

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2011-01-31 15:18:30 UTC (rev 34582)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2011-01-31 16:16:15 UTC (rev 34583)
@@ -2311,6 +2311,7 @@
 
 	prop= RNA_def_property(srna, "backdrop_zoom", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "zoom");
+    RNA_def_property_range(prop, 0.01f, FLT_MAX);
 	RNA_def_property_ui_text(prop, "Backdrop Zoom", "Backdrop zoom factor");
 	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_NODE_VIEW, NULL);