[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47160] trunk/blender/source/blender: remove pynodes, were not working in 2.5, not ported to py3.x
Campbell Barton
ideasman42 at gmail.com
Tue May 29 11:37:23 CEST 2012
Revision: 47160
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47160
Author: campbellbarton
Date: 2012-05-29 09:37:23 +0000 (Tue, 29 May 2012)
Log Message:
-----------
remove pynodes, were not working in 2.5, not ported to py3.x
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_header.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/nodes/CMakeLists.txt
Removed Paths:
-------------
trunk/blender/source/blender/nodes/shader/nodes/node_shader_dynamic.c
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2012-05-29 08:55:16 UTC (rev 47159)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2012-05-29 09:37:23 UTC (rev 47160)
@@ -229,7 +229,7 @@
#define NODE_CLASS_CONVERTOR 8
#define NODE_CLASS_MATTE 9
#define NODE_CLASS_DISTORT 10
-#define NODE_CLASS_OP_DYNAMIC 11
+#define NODE_CLASS_OP_DYNAMIC 11 /* deprecated */
#define NODE_CLASS_PATTERN 12
#define NODE_CLASS_TEXTURE 13
#define NODE_CLASS_EXECUTION 14
@@ -434,8 +434,6 @@
#define NODE_FORLOOP 3
#define NODE_WHILELOOP 4
#define NODE_FRAME 5
-#define NODE_GROUP_MENU 10000
-#define NODE_DYNAMIC_MENU 20000
/* look up a socket on a group node by the internal group socket */
struct bNodeSocket *node_group_find_input(struct bNode *gnode, struct bNodeSocket *gsock);
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2012-05-29 08:55:16 UTC (rev 47159)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2012-05-29 09:37:23 UTC (rev 47160)
@@ -135,20 +135,9 @@
for (node= ntree->nodes.first; node; node= next) {
next= node->next;
- node->typeinfo= node_get_type(ntree, node->type);
-
- if (node->type==NODE_DYNAMIC) {
- /* needed info if the pynode script fails now: */
- node->storage= ntree;
- if (node->id!=NULL) { /* not an empty script node */
- node->custom1 = 0;
- node->custom1 = BSET(node->custom1, NODE_DYNAMIC_ADDEXIST);
- }
-// if (node->typeinfo)
-// node->typeinfo->initfunc(node);
- }
+ node->typeinfo = node_get_type(ntree, node->type);
- if (node->typeinfo==NULL) {
+ if (node->typeinfo == NULL) {
printf("Error: Node type %s doesn't exist anymore, removed\n", node->name);
nodeFreeNode(ntree, node);
}
@@ -354,26 +343,6 @@
return node;
}
-void nodeMakeDynamicType(bNode *node)
-{
- /* find SH_DYNAMIC_NODE ntype */
- bNodeType *ntype= ntreeGetType(NTREE_SHADER)->node_types.first;
- while (ntype) {
- if (ntype->type==NODE_DYNAMIC)
- break;
- ntype= ntype->next;
- }
-
- /* make own type struct to fill */
- if (ntype) {
- /*node->typeinfo= MEM_dupallocN(ntype);*/
- bNodeType *newtype= MEM_callocN(sizeof(bNodeType), "dynamic bNodeType");
- *newtype= *ntype;
- BLI_strncpy(newtype->name, ntype->name, sizeof(newtype->name));
- node->typeinfo= newtype;
- }
-}
-
/* keep socket listorder identical, for copying links */
/* ntree is the target tree */
bNode *nodeCopyNode(struct bNodeTree *ntree, struct bNode *node)
@@ -1976,7 +1945,6 @@
register_node_type_sh_math(ttype);
register_node_type_sh_vect_math(ttype);
register_node_type_sh_squeeze(ttype);
- //register_node_type_sh_dynamic(ttype);
register_node_type_sh_material_ext(ttype);
register_node_type_sh_invert(ttype);
register_node_type_sh_seprgb(ttype);
@@ -2069,30 +2037,12 @@
register_node_type_tex_proc_distnoise(ttype);
}
-static void free_dynamic_typeinfo(bNodeType *ntype)
-{
- if (ntype->type==NODE_DYNAMIC) {
- if (ntype->inputs) {
- MEM_freeN(ntype->inputs);
- }
- if (ntype->outputs) {
- MEM_freeN(ntype->outputs);
- }
- if (ntype->name) {
- MEM_freeN((void *)ntype->name);
- }
- }
-}
-
static void free_typeinfos(ListBase *list)
{
bNodeType *ntype, *next;
for (ntype=list->first; ntype; ntype=next) {
next = ntype->next;
-
- if (ntype->type==NODE_DYNAMIC)
- free_dynamic_typeinfo(ntype);
-
+
if (ntype->needs_free)
MEM_freeN(ntype);
}
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-05-29 08:55:16 UTC (rev 47159)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-05-29 09:37:23 UTC (rev 47160)
@@ -2397,11 +2397,6 @@
link_list(fd, &ntree->nodes);
for (node = ntree->nodes.first; node; node = node->next) {
- if (node->type == NODE_DYNAMIC) {
- node->custom1 = 0;
- node->custom1 = BSET(node->custom1, NODE_DYNAMIC_LOADED);
- }
-
node->typeinfo = NULL;
link_list(fd, &node->inputs);
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2012-05-29 08:55:16 UTC (rev 47159)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2012-05-29 09:37:23 UTC (rev 47160)
@@ -715,7 +715,7 @@
write_node_socket(wd, sock);
- if (node->storage && node->type!=NODE_DYNAMIC) {
+ if (node->storage) {
/* could be handlerized at some point, now only 1 exception still */
if (ntree->type==NTREE_SHADER && (node->type==SH_NODE_CURVE_VEC || node->type==SH_NODE_CURVE_RGB))
write_curvemapping(wd, node->storage);
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-05-29 08:55:16 UTC (rev 47159)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-05-29 09:37:23 UTC (rev 47160)
@@ -417,38 +417,7 @@
node->menunr = 0;
}
#endif
-static void node_dynamic_update_cb(bContext *C, void *UNUSED(ntree_v), void *node_v)
-{
- Main *bmain = CTX_data_main(C);
- Material *ma;
- bNode *node = (bNode *)node_v;
- ID *id = node->id;
- int error = 0;
- if (BTST(node->custom1, NODE_DYNAMIC_ERROR)) error = 1;
-
- /* Users only have to press the "update" button in one pynode
- * and we also update all others sharing the same script */
- for (ma = bmain->mat.first; ma; ma = ma->id.next) {
- if (ma->nodetree) {
- bNode *nd;
- for (nd = ma->nodetree->nodes.first; nd; nd = nd->next) {
- if ((nd->type == NODE_DYNAMIC) && (nd->id == id)) {
- nd->custom1 = 0;
- nd->custom1 = BSET(nd->custom1, NODE_DYNAMIC_REPARSE);
- nd->menunr = 0;
- if (error)
- nd->custom1 = BSET(nd->custom1, NODE_DYNAMIC_ERROR);
- }
- }
- }
- }
-
- // allqueue(REDRAWBUTSSHADING, 0);
- // allqueue(REDRAWNODE, 0);
- // XXX BIF_preview_changed(ID_MA);
-}
-
static void node_buts_texture(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
{
bNode *node = ptr->data;
@@ -1107,34 +1076,6 @@
}
/* ****************** BUTTON CALLBACKS FOR SHADER NODES ***************** */
-
-static void node_browse_text_cb(bContext *C, void *ntree_v, void *node_v)
-{
- Main *bmain = CTX_data_main(C);
- bNodeTree *ntree = ntree_v;
- bNode *node = node_v;
- /* ID *oldid; */ /* UNUSED */
-
- if (node->menunr < 1) return;
-
- if (node->id) {
- node->id->us--;
- }
- /* oldid= node->id; */ /* UNUSED */
- node->id = BLI_findlink(&bmain->text, node->menunr - 1);
- id_us_plus(node->id);
- BLI_strncpy(node->name, node->id->name + 2, sizeof(node->name));
-
- node->custom1 = BSET(node->custom1, NODE_DYNAMIC_NEW);
-
- nodeSetActive(ntree, node);
-
- // allqueue(REDRAWBUTSSHADING, 0);
- // allqueue(REDRAWNODE, 0);
-
- node->menunr = 0;
-}
-
static void node_shader_buts_material(uiLayout *layout, bContext *C, PointerRNA *ptr)
{
bNode *node = ptr->data;
@@ -1254,45 +1195,6 @@
uiItemR(layout, ptr, "distribution", 0, "", ICON_NONE);
}
-static void node_shader_buts_dynamic(uiLayout *layout, bContext *C, PointerRNA *ptr)
-{
- Main *bmain = CTX_data_main(C);
- uiBlock *block = uiLayoutAbsoluteBlock(layout);
- bNode *node = ptr->data;
- bNodeTree *ntree = ptr->id.data;
- rctf *butr = &node->butr;
- uiBut *bt;
- // XXX SpaceNode *snode= curarea->spacedata.first;
- short dy = (short)butr->ymin;
- int xoff = 0;
-
- /* B_NODE_EXEC is handled in butspace.c do_node_buts */
- if (!node->id) {
- const char *strp;
- IDnames_to_pupstring(&strp, NULL, "", &(bmain->text), NULL, NULL);
- node->menunr = 0;
- bt = uiDefButS(block, MENU, B_NODE_EXEC /*+node->nr*/, strp,
- butr->xmin, dy, 19, 19,
- &node->menunr, 0, 0, 0, 0, "Browses existing choices");
- uiButSetFunc(bt, node_browse_text_cb, ntree, node);
- xoff = 19;
- if (strp) MEM_freeN((void *)strp);
- }
- else {
- bt = uiDefBut(block, BUT, B_NOP, "Update",
- butr->xmin + xoff, butr->ymin + 20, 50, 19,
- &node->menunr, 0.0, 19.0, 0, 0, "Refresh this node (and all others that use the same script)");
- uiButSetFunc(bt, node_dynamic_update_cb, ntree, node);
-
- if (BTST(node->custom1, NODE_DYNAMIC_ERROR)) {
- // UI_ThemeColor(TH_REDALERT);
- // XXX ui_rasterpos_safe(butr->xmin + xoff, butr->ymin + 5, snode->aspect);
- // XXX snode_drawstring(snode, "Error! Check console...", butr->xmax - butr->xmin);
- ;
- }
- }
-}
-
/* only once called */
static void node_shader_set_butfunc(bNodeType *ntype)
{
@@ -1370,9 +1272,6 @@
case SH_NODE_BSDF_GLASS:
ntype->uifunc = node_shader_buts_glossy;
break;
- case NODE_DYNAMIC:
- ntype->uifunc = node_shader_buts_dynamic;
- break;
}
}
Modified: trunk/blender/source/blender/editors/space_node/node_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_header.c 2012-05-29 08:55:16 UTC (rev 47159)
+++ trunk/blender/source/blender/editors/space_node/node_header.c 2012-05-29 09:37:23 UTC (rev 47160)
@@ -157,22 +157,6 @@
do_node_add(C, &ntemp);
}
-#if 0 /* disabled */
-static void do_node_add_dynamic(bContext *C, void *UNUSED(arg), int event)
-{
- Main *bmain = CTX_data_main(C);
- Scene *scene = CTX_data_scene(C);
- bNodeTemplate ntemp;
-
- ntemp.type = NODE_DYNAMIC;
-
- ntemp.main = bmain;
- ntemp.scene = scene;
-
- do_node_add(C, &ntemp);
-}
-#endif
-
static int node_tree_has_type(int treetype, int nodetype)
{
bNodeTreeType *ttype= ntreeGetType(treetype);
@@ -228,9 +212,6 @@
}
}
}
- else if (nodeclass==NODE_DYNAMIC) {
- /* disabled */
- }
else {
bNodeType *ntype;
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-05-29 08:55:16 UTC (rev 47159)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-05-29 09:37:23 UTC (rev 47160)
@@ -1069,15 +1069,7 @@
item++;
}
}
-
- item->value = NODE_DYNAMIC;
- item->identifier = "SCRIPT";
- item->icon = 0;
- item->name = "Script";
- item->description = "";
-
- item++;
-
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list