[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32894] trunk/blender/source/blender/ editors/space_node/drawnode.c: Fix #24556: N Panel in Compositor doesn' t work with Vector Normal node.
Brecht Van Lommel
brechtvanlommel at pandora.be
Sat Nov 6 18:55:44 CET 2010
Revision: 32894
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32894
Author: blendix
Date: 2010-11-06 18:55:43 +0100 (Sat, 06 Nov 2010)
Log Message:
-----------
Fix #24556: N Panel in Compositor doesn't work with Vector Normal node.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_node/drawnode.c
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2010-11-06 17:25:33 UTC (rev 32893)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2010-11-06 17:55:43 UTC (rev 32894)
@@ -58,6 +58,8 @@
#include "RNA_access.h"
+#include "ED_node.h"
+
#include "WM_api.h"
#include "WM_types.h"
@@ -169,16 +171,27 @@
uiTemplateCurveMapping(layout, ptr, "mapping", 'c', 0, 0);
}
+static void node_normal_cb(bContext *C, void *ntree_v, void *node_v)
+{
+ Main *bmain = CTX_data_main(C);
+
+ ED_node_generic_update(bmain, ntree_v, node_v);
+ WM_event_add_notifier(C, NC_NODE|NA_EDITED, ntree_v);
+}
+
static void node_buts_normal(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
{
uiBlock *block= uiLayoutAbsoluteBlock(layout);
+ bNodeTree *ntree= ptr->id.data;
bNode *node= ptr->data;
rctf *butr= &node->butr;
bNodeSocket *sock= node->outputs.first; /* first socket stores normal */
+ uiBut *bt;
- uiDefButF(block, BUT_NORMAL, B_NODE_EXEC, "",
+ bt= uiDefButF(block, BUT_NORMAL, B_NODE_EXEC, "",
(short)butr->xmin, (short)butr->xmin, butr->xmax-butr->xmin, butr->xmax-butr->xmin,
sock->ns.vec, 0.0f, 1.0f, 0, 0, "");
+ uiButSetFunc(bt, node_normal_cb, ntree, node);
}
#if 0 // not used in 2.5x yet
static void node_browse_tex_cb(bContext *C, void *ntree_v, void *node_v)
More information about the Bf-blender-cvs
mailing list