[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36550] branches/particles-2010/source/ blender: A couple more bugfixes and code cleanup.
Lukas Toenne
lukas.toenne at googlemail.com
Sun May 8 18:08:08 CEST 2011
Revision: 36550
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36550
Author: lukastoenne
Date: 2011-05-08 16:08:08 +0000 (Sun, 08 May 2011)
Log Message:
-----------
A couple more bugfixes and code cleanup.
Modified Paths:
--------------
branches/particles-2010/source/blender/blenkernel/BKE_blender.h
branches/particles-2010/source/blender/blenkernel/BKE_node.h
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/blenloader/intern/writefile.c
branches/particles-2010/source/blender/editors/SConscript
branches/particles-2010/source/blender/editors/space_node/node_draw.c
branches/particles-2010/source/blender/editors/space_node/node_edit.c
branches/particles-2010/source/blender/editors/space_node/node_header.c
branches/particles-2010/source/blender/editors/space_node/space_node.c
branches/particles-2010/source/blender/editors/transform/transform_conversions.c
branches/particles-2010/source/blender/makesrna/intern/rna_internal.h
branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
branches/particles-2010/source/blender/nodes/CMP_node.h
branches/particles-2010/source/blender/nodes/SConscript
branches/particles-2010/source/blender/nodes/SHD_node.h
branches/particles-2010/source/blender/nodes/TEX_node.h
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_common.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodetree.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_common.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodetree.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_common.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodetree.c
branches/particles-2010/source/blender/nodes/intern/node_common.c
Modified: branches/particles-2010/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_blender.h 2011-05-08 14:23:38 UTC (rev 36549)
+++ branches/particles-2010/source/blender/blenkernel/BKE_blender.h 2011-05-08 16:08:08 UTC (rev 36550)
@@ -44,7 +44,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather then defining with quotes */
#define BLENDER_VERSION 257
-#define BLENDER_SUBVERSION 1
+#define BLENDER_SUBVERSION 2
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: branches/particles-2010/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_node.h 2011-05-08 14:23:38 UTC (rev 36549)
+++ branches/particles-2010/source/blender/blenkernel/BKE_node.h 2011-05-08 16:08:08 UTC (rev 36550)
@@ -50,7 +50,6 @@
struct bNodeSocket;
struct bNodeStack;
struct bNodeTree;
-struct bNodeExec;
struct bNodeTreeExec;
struct GPUMaterial;
struct GPUNode;
@@ -61,9 +60,7 @@
struct uiBlock;
struct uiLayout;
struct MTex;
-struct StructRNA;
struct PointerRNA;
-struct PropertyRNA;
struct rctf;
struct RenderData;
struct Scene;
@@ -71,10 +68,6 @@
struct SpaceNode;
struct ARegion;
struct Object;
-struct DerivedMesh;
-struct ParticleSystem;
-struct bNodeDataReader;
-struct bNodeDataSource;
/* ************** NODE TYPE DEFINITIONS ***** */
@@ -185,9 +178,9 @@
/* group edit callbacks for operators */
/* XXX this is going to be changed as required by the UI */
- struct bNodeTree *(*edit_get)(struct bNode *node);
- struct bNodeTree *(*edit_set)(struct bNode *node, int edit);
- void (*edit_clear)(struct bNode *node);
+ struct bNodeTree *(*group_edit_get)(struct bNode *node);
+ struct bNodeTree *(*group_edit_set)(struct bNode *node, int edit);
+ void (*group_edit_clear)(struct bNode *node);
/* **** execution callbacks **** */
@@ -251,14 +244,14 @@
typedef struct bNodeTreeType
{
int type; /* type identifier */
- char id_name[24]; /* id name for RNA identification */
+ char idname[64]; /* id name for RNA identification */
ListBase node_types; /* type definitions */
/* callbacks */
- void (*freeCache)(struct bNodeTree *ntree);
- void (*freeNodeCache)(struct bNodeTree *ntree, struct bNode *node);
- void (*foreachNodeTree)(struct Main *main, void *calldata, bNodeTreeCallback func); /* iteration over all node trees */
+ void (*free_cache)(struct bNodeTree *ntree);
+ void (*free_node_cache)(struct bNodeTree *ntree, struct bNode *node);
+ void (*foreach_nodetree)(struct Main *main, void *calldata, bNodeTreeCallback func); /* iteration over all node trees */
/* calls allowing threaded composite */
void (*localize)(struct bNodeTree *localtree, struct bNodeTree *ntree);
@@ -268,7 +261,7 @@
/* Tree update. Overrides nodetype->updatetreefunc! */
void (*update)(struct bNodeTree *ntree);
/* Node update. Overrides nodetype->updatefunc! */
- void (*updateNode)(struct bNodeTree *ntree, struct bNode *node);
+ void (*update_node)(struct bNodeTree *ntree, struct bNode *node);
int (*validate_link)(struct bNodeTree *ntree, struct bNodeLink *link);
} bNodeTreeType;
@@ -364,9 +357,9 @@
struct bNodeTemplate nodeMakeTemplate(struct bNode *node);
int nodeValid(struct bNodeTree *ntree, struct bNodeTemplate *ntemp);
const char* nodeLabel(struct bNode *node);
-struct bNodeTree *nodeEditGet(struct bNode *node);
-struct bNodeTree *nodeEditSet(struct bNode *node, int edit);
-void nodeEditClear(struct bNode *node);
+struct bNodeTree *nodeGroupEditGet(struct bNode *node);
+struct bNodeTree *nodeGroupEditSet(struct bNode *node, int edit);
+void nodeGroupEditClear(struct bNode *node);
/* Init a new node type struct with default values and callbacks */
void node_type_base(struct bNodeType *ntype, int type, const char *name, short nclass, short flag);
@@ -386,10 +379,10 @@
void node_type_tree(struct bNodeType *ntype,
void (*inittreefunc)(struct bNodeTree *),
void (*updatetreefunc)(struct bNodeTree *));
-void node_type_edit(struct bNodeType *ntype,
- struct bNodeTree *(*edit_get)(struct bNode *node),
- struct bNodeTree *(*edit_set)(struct bNode *node, int edit),
- void (*edit_clear)(struct bNode *node));
+void node_type_group_edit(struct bNodeType *ntype,
+ struct bNodeTree *(*group_edit_get)(struct bNode *node),
+ struct bNodeTree *(*group_edit_set)(struct bNode *node, int edit),
+ void (*group_edit_clear)(struct bNode *node));
void node_type_exec(struct bNodeType *ntype, void (*execfunc)(void *data, struct bNode *, struct bNodeStack **, struct bNodeStack **));
void node_type_exec_new(struct bNodeType *ntype,
Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/particles-2010/source/blender/blenkernel/intern/node.c 2011-05-08 14:23:38 UTC (rev 36549)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c 2011-05-08 16:08:08 UTC (rev 36550)
@@ -857,8 +857,8 @@
/* since it is called while free database, node->id is undefined */
- if (treetype->freeNodeCache)
- treetype->freeNodeCache(ntree, node);
+ if (treetype->free_node_cache)
+ treetype->free_node_cache(ntree, node);
for (sock=node->inputs.first; sock; sock = nextsock) {
nextsock = sock->next;
@@ -920,8 +920,8 @@
if(ntree==NULL) return;
treetype= ntreeGetType(ntree->type);
- if (treetype->freeCache)
- treetype->freeCache(ntree);
+ if (treetype->free_cache)
+ treetype->free_cache(ntree);
}
void ntreeSetOutput(bNodeTree *ntree)
@@ -1037,7 +1037,7 @@
cd.local = 0;
cd.lib = 0;
- treetype->foreachNodeTree(G.main, &cd, &ntreeMakeLocal_CheckLocal);
+ treetype->foreach_nodetree(G.main, &cd, &ntreeMakeLocal_CheckLocal);
/* if all users are local, we simply make tree local */
if(cd.local && cd.lib==0) {
@@ -1053,7 +1053,7 @@
cd.new_id = &newtree->id;
- treetype->foreachNodeTree(G.main, &cd, &ntreeMakeLocal_LinkNew);
+ treetype->foreach_nodetree(G.main, &cd, &ntreeMakeLocal_LinkNew);
}
}
@@ -1449,8 +1449,8 @@
for (n=0; n < NUM_NTREE_TYPES; ++n) {
ntreetype= ntreeGetType(n);
- if (ntreetype && ntreetype->foreachNodeTree)
- ntreetype->foreachNodeTree(main, id, ntree_verify_nodes_cb);
+ if (ntreetype && ntreetype->foreach_nodetree)
+ ntreetype->foreach_nodetree(main, id, ntree_verify_nodes_cb);
}
for (ntree=main->nodetree.first; ntree; ntree=ntree->id.next)
ntree_verify_nodes_cb(id, NULL, ntree);
@@ -1472,8 +1472,8 @@
/* update individual nodes */
for (n=0; n < totnodes; ++n) {
node = deplist[n];
- if (ntreetype->updateNode)
- ntreetype->updateNode(ntree, node);
+ if (ntreetype->update_node)
+ ntreetype->update_node(ntree, node);
else if (node->typeinfo->updatefunc)
node->typeinfo->updatefunc(ntree, node);
}
@@ -1506,8 +1506,8 @@
{
bNodeTreeType *ntreetype = ntreeGetType(ntree->type);
- if (ntreetype->updateNode)
- ntreetype->updateNode(ntree, node);
+ if (ntreetype->update_node)
+ ntreetype->update_node(ntree, node);
else if (node->typeinfo->updatefunc)
node->typeinfo->updatefunc(ntree, node);
}
@@ -1521,11 +1521,11 @@
if(ELEM(NULL, id, ntree))
return change;
- if (ntreetype->updateNode) {
+ if (ntreetype->update_node) {
for(node= ntree->nodes.first; node; node= node->next) {
if(node->id==id) {
change = TRUE;
- ntreetype->updateNode(ntree, node);
+ ntreetype->update_node(ntree, node);
}
}
}
@@ -1605,28 +1605,28 @@
return node->typeinfo->name;
}
-struct bNodeTree *nodeEditGet(struct bNode *node)
+struct bNodeTree *nodeGroupEditGet(struct bNode *node)
{
- if (node->typeinfo->edit_get)
- return node->typeinfo->edit_get(node);
+ if (node->typeinfo->group_edit_get)
+ return node->typeinfo->group_edit_get(node);
else
return NULL;
}
-struct bNodeTree *nodeEditSet(struct bNode *node, int edit)
+struct bNodeTree *nodeGroupEditSet(struct bNode *node, int edit)
{
- if (node->typeinfo->edit_set)
- return node->typeinfo->edit_set(node, edit);
- else if (node->typeinfo->edit_get)
- return node->typeinfo->edit_get(node);
+ if (node->typeinfo->group_edit_set)
+ return node->typeinfo->group_edit_set(node, edit);
+ else if (node->typeinfo->group_edit_get)
+ return node->typeinfo->group_edit_get(node);
else
return NULL;
}
-void nodeEditClear(struct bNode *node)
+void nodeGroupEditClear(struct bNode *node)
{
- if (node->typeinfo->edit_clear)
- node->typeinfo->edit_clear(node);
+ if (node->typeinfo->group_edit_clear)
+ node->typeinfo->group_edit_clear(node);
}
struct bNodeTemplate nodeMakeTemplate(struct bNode *node)
@@ -1718,14 +1718,14 @@
ntype->updatetreefunc = updatetreefunc;
}
-void node_type_edit(struct bNodeType *ntype,
- struct bNodeTree *(*edit_get)(struct bNode *node),
- struct bNodeTree *(*edit_set)(struct bNode *node, int edit),
- void (*edit_clear)(struct bNode *node))
+void node_type_group_edit(struct bNodeType *ntype,
+ struct bNodeTree *(*group_edit_get)(struct bNode *node),
+ struct bNodeTree *(*group_edit_set)(struct bNode *node, int edit),
+ void (*group_edit_clear)(struct bNode *node))
{
- ntype->edit_get = edit_get;
- ntype->edit_set = edit_set;
- ntype->edit_clear = edit_clear;
+ ntype->group_edit_get = group_edit_get;
+ ntype->group_edit_set = group_edit_set;
+ ntype->group_edit_clear = group_edit_clear;
}
void node_type_exec(struct bNodeType *ntype, void (*execfunc)(void *data, struct bNode *, struct bNodeStack **, struct bNodeStack **))
@@ -1777,9 +1777,9 @@
{
register_node_type_frame(ntypelist);
- register_node_type_group_composite(ntypelist);
-// register_node_type_forloop_composite(ntypelist);
-// register_node_type_whileloop_composite(ntypelist);
+ register_node_type_cmp_group(ntypelist);
+// register_node_type_cmp_forloop(ntypelist);
+// register_node_type_cmp_whileloop(ntypelist);
register_node_type_cmp_rlayers(ntypelist);
register_node_type_cmp_image(ntypelist);
@@ -1857,9 +1857,9 @@
{
register_node_type_frame(ntypelist);
- register_node_type_group_shader(ntypelist);
-// register_node_type_forloop_shader(ntypelist);
-// register_node_type_whileloop_shader(ntypelist);
+ register_node_type_sh_group(ntypelist);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list