[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45597] trunk/blender/source/blender/ editors/space_node/node_buttons.c: Node Editor / Properties Region:

[Thomas Dinges]

Revision: 45597
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45597
Author:   dingto
Date:     2012-04-13 11:58:16 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
Node Editor / Properties Region:
* Improved checks for Grease Pencil and Active Node panel, so the panel only gets shown when there is valid data, rather than showing the empty panel. 

Thanks to Lukas T?\195?\182nne for some help! :) 

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_buttons.c

Modified: trunk/blender/source/blender/editors/space_node/node_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_buttons.c	2012-04-13 10:37:33 UTC (rev 45596)
+++ trunk/blender/source/blender/editors/space_node/node_buttons.c	2012-04-13 11:58:16 UTC (rev 45597)
@@ -65,13 +65,20 @@
 
 /* ******************* node space & buttons ************** */
 
+/* poll for active nodetree */
+static int active_nodetree_poll(const bContext *C, PanelType *UNUSED(pt))
+{
+	SpaceNode *snode= CTX_wm_space_node(C);
+	
+	return (snode && snode->nodetree);
+}
+
 /* poll callback for active node */
 static int active_node_poll(const bContext *C, PanelType *UNUSED(pt))
 {
 	SpaceNode *snode= CTX_wm_space_node(C);
 	
-	// TODO: include check for whether there is an active node...
-	return (snode && snode->nodetree);
+	return (snode && snode->edittree && nodeGetActive(snode->edittree));
 }
 
 /* active node */
@@ -160,7 +167,7 @@
 	strcpy(pt->idname, "NODE_PT_gpencil");
 	strcpy(pt->label, "Grease Pencil");
 	pt->draw= gpencil_panel_standard;
-	pt->poll= active_node_poll;
+	pt->poll= active_nodetree_poll;
 	BLI_addtail(&art->paneltypes, pt);
 }