Revision: 24486
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24486
Author: aligorith
Date: 2009-11-11 11:51:40 +0100 (Wed, 11 Nov 2009)
Log Message:
-----------
Nodes Editor + other warning fixes:
* Added 'active node' panel for the Nodes Editor. This panel, in the NKEY
region, shows the settings for the active node. Included in this panel is a
field used for editing the unique-name of the node too.
* Fixed a number of uninitialised vars warnings that I missed in previous
commit...
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_node/node_buttons.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
trunk/blender/source/blender/python/intern/bpy_operator.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
Modified: trunk/blender/source/blender/editors/space_node/node_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_buttons.c
2009-11-11 10:44:46 UTC (rev 24485)
+++ trunk/blender/source/blender/editors/space_node/node_buttons.c
2009-11-11 10:51:40 UTC (rev 24486)
@@ -49,6 +49,7 @@
#include "BKE_depsgraph.h"
#include "BKE_idprop.h"
#include "BKE_object.h"
+#include "BKE_node.h"
#include "BKE_global.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
@@ -78,7 +79,6 @@
#define B_NOP 1
#define B_REDR 2
-#if 0 // XXX not used...
static void do_node_region_buttons(bContext *C, void *arg, int event)
{
//SpaceNode *snode= CTX_wm_space_node(C);
@@ -89,15 +89,57 @@
return; /* no notifier! */
}
}
-#endif
+/* poll callback for active node */
+static int active_node_poll(const bContext *C, PanelType *pt)
+{
+ SpaceNode *snode= CTX_wm_space_node(C);
+
+ // TODO: include check for whether there is an active node...
+ return (snode && snode->nodetree);
+}
+
+/* active node */
+static void active_node_panel(const bContext *C, Panel *pa)
+{
+ SpaceNode *snode= CTX_wm_space_node(C);
+ bNodeTree *ntree= (snode) ? snode->nodetree : NULL; // XXX what's up
with edittree then?
+ bNode *node = (ntree) ? nodeGetActive(ntree) : NULL;
+ uiLayout *layout= pa->layout;
+ uiBlock *block;
+ PointerRNA ptr;
+
+ /* verify pointers, and create RNA pointer for the node */
+ if ELEM(NULL, ntree, node)
+ return;
+ RNA_pointer_create(&ntree->id, &RNA_Node, node, &ptr);
+
+ /* set update callback */
+ // xxx is this really needed
+ block= uiLayoutGetBlock(layout);
+ uiBlockSetHandleFunc(block, do_node_region_buttons, NULL);
+
+ /* draw this node's name, etc. */
+ uiItemR(layout, NULL, ICON_NODE, &ptr, "name", 0);
+ // TODO: a separator would be nice...
+
+ /* draw this node's settings */
+ if (node->typeinfo && node->typeinfo->uifunc)
+ node->typeinfo->uifunc(layout, (bContext *)C, &ptr);
+}
+
/* ******************* node buttons registration ************** */
void node_buttons_register(ARegionType *art)
{
PanelType *pt;
- // XXX active node
+ pt= MEM_callocN(sizeof(PanelType), "spacetype node panel active node");
+ strcpy(pt->idname, "NODE_PT_item");
+ strcpy(pt->label, "Active Node");
+ pt->draw= active_node_panel;
+ pt->poll= active_node_poll;
+ BLI_addtail(&art->paneltypes, pt);
pt= MEM_callocN(sizeof(PanelType), "spacetype node panel gpencil");
strcpy(pt->idname, "NODE_PT_gpencil");
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
2009-11-11 10:44:46 UTC (rev 24485)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
2009-11-11 10:51:40 UTC (rev 24486)
@@ -50,7 +50,7 @@
static void fill_bins(bNode* node, CompBuf* in, int* bins)
{
float value[4];
- int ivalue;
+ int ivalue=0;
int x,y;
/*fill bins */
Modified: trunk/blender/source/blender/python/intern/bpy_operator.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_operator.c 2009-11-11
10:44:46 UTC (rev 24485)
+++ trunk/blender/source/blender/python/intern/bpy_operator.c 2009-11-11
10:51:40 UTC (rev 24486)
@@ -153,7 +153,7 @@
int all_args = 1;
int error_val= 0;
- char *buf;
+ char *buf = NULL;
PyObject *pybuf;
bContext *C = BPy_GetContext();
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2009-11-11
10:44:46 UTC (rev 24485)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2009-11-11
10:51:40 UTC (rev 24486)
@@ -1757,7 +1757,7 @@
static PyObject *foreach_getset(BPy_PropertyRNA *self, PyObject *args, int set)
{
PyObject *item = NULL;
- int i=0, ok, buffer_is_compat;
+ int i=0, ok=0, buffer_is_compat;
void *array= NULL;
/* get/set both take the same args currently */
Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c
2009-11-11 10:44:46 UTC (rev 24485)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c
2009-11-11 10:51:40 UTC (rev 24486)
@@ -985,4 +985,5 @@
win->eventstate->prevx= oldx;
win->eventstate->prevy= oldy;
}
-}
\ No newline at end of file
+}
+
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
