Revision: 47753
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47753
Author: campbellbarton
Date: 2012-06-11 18:43:48 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
rna read/write access to ...
node_tree.nodes.active
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/editors/space_node/space_node.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2012-06-11 18:43:16 UTC
(rev 47752)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2012-06-11 18:43:48 UTC
(rev 47753)
@@ -372,6 +372,7 @@
struct bNode *nodeGetActive(struct bNodeTree *ntree);
struct bNode *nodeGetActiveID(struct bNodeTree *ntree, short idtype);
int nodeSetActiveID(struct bNodeTree *ntree, short
idtype, struct ID *id);
+void nodeClearActive(struct bNodeTree *ntree);
void nodeClearActiveID(struct bNodeTree *ntree, short
idtype);
struct bNode *nodeGetActiveTexture(struct bNodeTree *ntree);
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2012-06-11
18:43:16 UTC (rev 47752)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2012-06-11
18:43:48 UTC (rev 47753)
@@ -1313,6 +1313,17 @@
node->flag &= ~NODE_ACTIVE_ID;
}
+void nodeClearActive(bNodeTree *ntree)
+{
+ bNode *node;
+
+ if (ntree==NULL) return;
+
+ for (node= ntree->nodes.first; node; node= node->next)
+ node->flag &= ~(NODE_ACTIVE | NODE_ACTIVE_ID);
+}
+
+
/* two active flags, ID nodes have special flag for buttons display */
void nodeSetActive(bNodeTree *ntree, bNode *node)
{
Modified: trunk/blender/source/blender/editors/space_node/space_node.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/space_node.c
2012-06-11 18:43:16 UTC (rev 47752)
+++ trunk/blender/source/blender/editors/space_node/space_node.c
2012-06-11 18:43:48 UTC (rev 47753)
@@ -492,16 +492,11 @@
return 1;
}
else if (CTX_data_equals(member, "active_node")) {
- bNode *node;
-
if (snode->edittree) {
- for (node=snode->edittree->nodes.last; node;
node=node->prev) {
- if (node->flag & NODE_ACTIVE) {
- CTX_data_pointer_set(result,
&snode->edittree->id, &RNA_Node, node);
- break;
- }
- }
+ bNode *node = nodeGetActive(snode->edittree);
+ CTX_data_pointer_set(result, &snode->edittree->id,
&RNA_Node, node);
}
+
CTX_data_type_set(result, CTX_DATA_TYPE_POINTER);
return 1;
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-06-11
18:43:16 UTC (rev 47752)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-06-11
18:43:48 UTC (rev 47753)
@@ -634,6 +634,22 @@
return item;
}
+static PointerRNA rna_NodeTree_active_node_get(PointerRNA *ptr)
+{
+ bNodeTree *ntree = (bNodeTree *)ptr->data;
+ bNode *node = nodeGetActive(ntree);
+ return rna_pointer_inherit_refine(ptr, &RNA_Node, node);
+}
+
+static void rna_NodeTree_active_node_set(PointerRNA *ptr, PointerRNA value)
+{
+ bNodeTree *ntree = (bNodeTree *)ptr->data;
+ if (value.data)
+ nodeSetActive(ntree, (bNode *)value.data);
+ else
+ nodeClearActive(ntree);
+}
+
static bNode *rna_NodeTree_node_new(bNodeTree *ntree, bContext *C, ReportList
*reports,
int type, bNodeTree *group)
{
@@ -3632,6 +3648,19 @@
RNA_def_function_ui_description(func, "remove all node links from the
node tree");
}
+/* shared between all note tree types*/
+static void rna_def_nodetree_active_api(StructRNA *srna, PropertyRNA *cprop)
+{
+ PropertyRNA *prop;
+
+ prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
+ RNA_def_property_struct_type(prop, "Node");
+ RNA_def_property_pointer_funcs(prop, "rna_NodeTree_active_node_get",
"rna_NodeTree_active_node_set", NULL, NULL);
+ RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_UNLINK);
+ RNA_def_property_ui_text(prop, "Active Node", "Active node in this
tree");
+ RNA_def_property_update(prop, NC_SCENE | ND_OB_ACTIVE, NULL);
+}
+
static void rna_def_composite_nodetree_api(BlenderRNA *brna, PropertyRNA
*cprop)
{
StructRNA *srna;
@@ -3661,6 +3690,8 @@
func = RNA_def_function(srna, "clear", "rna_NodeTree_node_clear");
RNA_def_function_ui_description(func, "Remove all nodes from this node
tree");
+
+ rna_def_nodetree_active_api(srna, cprop);
}
static void rna_def_shader_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop)
@@ -3692,6 +3723,8 @@
func = RNA_def_function(srna, "clear", "rna_NodeTree_node_clear");
RNA_def_function_ui_description(func, "Remove all nodes from this node
tree");
+
+ rna_def_nodetree_active_api(srna, cprop);
}
static void rna_def_texture_nodetree_api(BlenderRNA *brna, PropertyRNA *cprop)
@@ -3723,6 +3756,8 @@
func = RNA_def_function(srna, "clear", "rna_NodeTree_node_clear");
RNA_def_function_ui_description(func, "Remove all nodes from this node
tree");
+
+ rna_def_nodetree_active_api(srna, cprop);
}
static void rna_def_node_socket(BlenderRNA *brna)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
