[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34223] branches/particles-2010/source/ blender: Renamed the bNodeTreeTypeInfo struct to just bNodeTreeType for consistency and simplicity
Lukas Toenne
lukas.toenne at googlemail.com
Mon Jan 10 11:33:40 CET 2011
Revision: 34223
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34223
Author: lukastoenne
Date: 2011-01-10 10:33:39 +0000 (Mon, 10 Jan 2011)
Log Message:
-----------
Renamed the bNodeTreeTypeInfo struct to just bNodeTreeType for consistency and simplicity
Modified Paths:
--------------
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/editors/space_node/drawnode.c
branches/particles-2010/source/blender/editors/space_node/node_draw.c
branches/particles-2010/source/blender/editors/space_node/node_header.c
branches/particles-2010/source/blender/nodes/CMP_node.h
branches/particles-2010/source/blender/nodes/SHD_node.h
branches/particles-2010/source/blender/nodes/SIM_node.h
branches/particles-2010/source/blender/nodes/TEX_node.h
branches/particles-2010/source/blender/nodes/intern/CMP_nodetree.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodetree.c
branches/particles-2010/source/blender/nodes/intern/SIM_nodetree.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodetree.c
Modified: branches/particles-2010/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_node.h 2011-01-10 10:22:08 UTC (rev 34222)
+++ branches/particles-2010/source/blender/blenkernel/BKE_node.h 2011-01-10 10:33:39 UTC (rev 34223)
@@ -166,7 +166,7 @@
#define NODE_CLASS_PARTICLES 25
typedef void (*bNodeTreeCallback)(void *calldata, struct ID *owner_id, struct bNodeTree *ntree);
-typedef struct bNodeTreeTypeInfo
+typedef struct bNodeTreeType
{
int type; /* type identifier */
char id_name[24]; /* id name for RNA identification */
@@ -187,11 +187,11 @@
* individual node update calls should be made internally if this function is defined! */
void (*updateNode)(struct bNodeTree *ntree, struct bNode *node);
int (*verifyLink)(struct bNodeTree *ntree, struct bNodeLink *link);
-} bNodeTreeTypeInfo;
+} bNodeTreeType;
/* ************** GENERIC API, TREES *************** */
-bNodeTreeTypeInfo *ntreeGetTypeInfo(int type);
+bNodeTreeType *ntreeGetType(int type);
void ntreeSocketTypeInfo(int type, const char **identifier, int *icon, const char **name);
struct bNodeTree *ntreeAddTree(const char *name, int type, const short is_group);
Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/particles-2010/source/blender/blenkernel/intern/node.c 2011-01-10 10:22:08 UTC (rev 34222)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c 2011-01-10 10:33:39 UTC (rev 34223)
@@ -65,9 +65,9 @@
#include "SIM_node.h"
-bNodeTreeTypeInfo *ntreeGetTypeInfo(int type)
+bNodeTreeType *ntreeGetType(int type)
{
- static bNodeTreeTypeInfo *types[NUM_NTREE_TYPES];
+ static bNodeTreeType *types[NUM_NTREE_TYPES];
static int types_init = 1;
if (types_init) {
types[NTREE_SHADER] = &ntreeType_Shader;
@@ -106,7 +106,7 @@
static bNodeType *node_get_type(bNodeTree *ntree, int type, ID *id)
{
- bNodeType *ntype = ntreeGetTypeInfo(ntree->type)->node_types.first;
+ bNodeType *ntype = ntreeGetType(ntree->type)->node_types.first;
for(; ntype; ntype= ntype->next)
if(ntype->type==type && id==ntype->id )
return ntype;
@@ -831,7 +831,7 @@
void nodeVerifyGroup(bNodeTree *ngroup)
{
- bNodeTreeTypeInfo *treetype= ntreeGetTypeInfo(ngroup->type);
+ bNodeTreeType *treetype= ntreeGetType(ngroup->type);
ntreeMakeGroupSockets(ngroup);
@@ -862,7 +862,7 @@
/* should become callbackable? */
void nodeGroupSocketUseFlags(bNodeTree *ngroup)
{
- bNodeTreeTypeInfo *treetype= ntreeGetTypeInfo(ngroup->type);
+ bNodeTreeType *treetype= ntreeGetType(ngroup->type);
bNode *node;
bNodeSocket *sock;
@@ -1110,7 +1110,7 @@
if(type>=NODE_DYNAMIC_MENU) {
int a=0, idx= type-NODE_DYNAMIC_MENU;
- ntype= ntreeGetTypeInfo(ntree->type)->node_types.first;
+ ntype= ntreeGetType(ntree->type)->node_types.first;
while(ntype) {
if(ntype->type==NODE_DYNAMIC) {
if(a==idx)
@@ -1160,7 +1160,7 @@
void nodeMakeDynamicType(bNode *node)
{
/* find SH_DYNAMIC_NODE ntype */
- bNodeType *ntype= ntreeGetTypeInfo(NTREE_SHADER)->node_types.first;
+ bNodeType *ntype= ntreeGetType(NTREE_SHADER)->node_types.first;
while(ntype) {
if(ntype->type==NODE_DYNAMIC && ntype->id==NULL)
break;
@@ -1540,7 +1540,7 @@
void nodeFreeNode(bNodeTree *ntree, bNode *node)
{
- bNodeTreeTypeInfo *treetype= ntreeGetTypeInfo(ntree->type);
+ bNodeTreeType *treetype= ntreeGetType(ntree->type);
bNodeSocket *sock, *nextsock;
bNodeSocketPanel *panel, *nextpanel;
@@ -1612,11 +1612,11 @@
void ntreeFreeCache(bNodeTree *ntree)
{
- bNodeTreeTypeInfo *treetype;
+ bNodeTreeType *treetype;
if(ntree==NULL) return;
- treetype= ntreeGetTypeInfo(ntree->type);
+ treetype= ntreeGetType(ntree->type);
if (treetype->freeCache)
treetype->freeCache(ntree);
}
@@ -1660,7 +1660,7 @@
void ntreeMakeLocal(bNodeTree *ntree)
{
- bNodeTreeTypeInfo *treetype= ntreeGetTypeInfo(ntree->type);
+ bNodeTreeType *treetype= ntreeGetType(ntree->type);
MakeLocalCallData cd;
/* - only lib users: do nothing
@@ -2013,7 +2013,7 @@
void ntreeValidateLinks(bNodeTree *ntree)
{
- bNodeTreeTypeInfo *tti = ntreeGetTypeInfo(ntree->type);
+ bNodeTreeType *tti = ntreeGetType(ntree->type);
bNodeLink *link;
for (link = ntree->links.first; link; link = link->next) {
@@ -2050,7 +2050,7 @@
void ntreeUpdateTree(bNodeTree *ntree)
{
- bNodeTreeTypeInfo *tti= ntreeGetTypeInfo(ntree->type);
+ bNodeTreeType *tti= ntreeGetType(ntree->type);
/* the solve-order is called on each tree change, so we should be sure no exec can be running */
ntreeEndExecTree(ntree);
@@ -2066,7 +2066,7 @@
void ntreeUpdateGroupTree(bNodeTree *ntree, bNodeTree *group)
{
- bNodeTreeTypeInfo *tti= ntreeGetTypeInfo(ntree->type);
+ bNodeTreeType *tti= ntreeGetType(ntree->type);
/* the solve-order is called on each tree change, so we should be sure no exec can be running */
ntreeEndExecTree(ntree);
@@ -2082,7 +2082,7 @@
void ntreeUpdateFullTree(bNodeTree *ntree)
{
- bNodeTreeTypeInfo *tti= ntreeGetTypeInfo(ntree->type);
+ bNodeTreeType *tti= ntreeGetType(ntree->type);
/* the solve-order is called on each tree change, so we should be sure no exec can be running */
ntreeEndExecTree(ntree);
@@ -2097,7 +2097,7 @@
void NodeTagChanged(bNodeTree *ntree, bNode *node)
{
- bNodeTreeTypeInfo *tti = ntreeGetTypeInfo(ntree->type);
+ bNodeTreeType *tti = ntreeGetType(ntree->type);
if (tti->updateNode)
tti->updateNode(ntree, node);
@@ -2107,7 +2107,7 @@
int NodeTagIDChanged(bNodeTree *ntree, ID *id)
{
- bNodeTreeTypeInfo *tti = ntreeGetTypeInfo(ntree->type);
+ bNodeTreeType *tti = ntreeGetType(ntree->type);
bNode *node;
int change = FALSE;
@@ -2140,23 +2140,23 @@
/* ******************* executing ************* */
void ntreeBeginExecTree(bNodeTree *ntree)
{
- bNodeTreeTypeInfo *treetype;
+ bNodeTreeType *treetype;
/* let's make it sure */
if(ntree->execdata)
return;
- treetype = ntreeGetTypeInfo(ntree->type);
+ treetype = ntreeGetType(ntree->type);
if (treetype->beginExec)
ntree->execdata = treetype->beginExec(ntree);
}
void ntreeEndExecTree(bNodeTree *ntree)
{
- bNodeTreeTypeInfo *treetype;
+ bNodeTreeType *treetype;
if(ntree->execdata) {
- treetype = ntreeGetTypeInfo(ntree->type);
+ treetype = ntreeGetType(ntree->type);
if (treetype->endExec)
treetype->endExec(ntree, ntree->execdata);
@@ -2168,7 +2168,7 @@
/* nodes are presorted, so exec is in order of list */
void ntreeExecTree(bNodeTree *ntree, void *callerdata, int thread)
{
- bNodeTreeTypeInfo *treetype= ntreeGetTypeInfo(ntree->type);
+ bNodeTreeType *treetype= ntreeGetType(ntree->type);
/* let's make it sure */
if(!ntree->execdata)
@@ -2553,20 +2553,20 @@
void init_nodesystem(void)
{
- registerCompositNodes(&ntreeGetTypeInfo(NTREE_COMPOSIT)->node_types);
- registerShaderNodes(&ntreeGetTypeInfo(NTREE_SHADER)->node_types);
- registerTextureNodes(&ntreeGetTypeInfo(NTREE_TEXTURE)->node_types);
- registerSimulationNodes(&ntreeGetTypeInfo(NTREE_SIMULATION)->node_types);
+ registerCompositNodes(&ntreeGetType(NTREE_COMPOSIT)->node_types);
+ registerShaderNodes(&ntreeGetType(NTREE_SHADER)->node_types);
+ registerTextureNodes(&ntreeGetType(NTREE_TEXTURE)->node_types);
+ registerSimulationNodes(&ntreeGetType(NTREE_SIMULATION)->node_types);
}
void free_nodesystem(void)
{
- /*remove_dynamic_typeinfos(&ntreeGetTypeInfo(NTREE_COMPOSIT)->node_types);*/ /* unused for now */
- BLI_freelistN(&ntreeGetTypeInfo(NTREE_COMPOSIT)->node_types);
- remove_dynamic_typeinfos(&ntreeGetTypeInfo(NTREE_SHADER)->node_types);
- BLI_freelistN(&ntreeGetTypeInfo(NTREE_SHADER)->node_types);
- BLI_freelistN(&ntreeGetTypeInfo(NTREE_TEXTURE)->node_types);
- BLI_freelistN(&ntreeGetTypeInfo(NTREE_SIMULATION)->node_types);
+ /*remove_dynamic_typeinfos(&ntreeGetType(NTREE_COMPOSIT)->node_types);*/ /* unused for now */
+ BLI_freelistN(&ntreeGetType(NTREE_COMPOSIT)->node_types);
+ remove_dynamic_typeinfos(&ntreeGetType(NTREE_SHADER)->node_types);
+ BLI_freelistN(&ntreeGetType(NTREE_SHADER)->node_types);
+ BLI_freelistN(&ntreeGetType(NTREE_TEXTURE)->node_types);
+ BLI_freelistN(&ntreeGetType(NTREE_SIMULATION)->node_types);
}
/* called from unlink_scene, when deleting a scene goes over all scenes
Modified: branches/particles-2010/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/particles-2010/source/blender/blenloader/intern/readfile.c 2011-01-10 10:22:08 UTC (rev 34222)
+++ branches/particles-2010/source/blender/blenloader/intern/readfile.c 2011-01-10 10:33:39 UTC (rev 34223)
@@ -2043,7 +2043,7 @@
{
bNodeTree *ntree;
int i;
- bNodeTreeTypeInfo *tti;
+ bNodeTreeType *tti;
/* this crashes blender on undo/redo
if(open==1) {
@@ -2057,7 +2057,7 @@
}
for (i = 0; i < NUM_NTREE_TYPES; ++i) {
- tti = ntreeGetTypeInfo(i);
+ tti = ntreeGetType(i);
if (tti != NULL && tti->foreachNodeTree)
tti->foreachNodeTree(main, NULL, lib_verify_nodetree_cb);
}
Modified: branches/particles-2010/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/particles-2010/source/blender/editors/space_node/drawnode.c 2011-01-10 10:22:08 UTC (rev 34222)
+++ branches/particles-2010/source/blender/editors/space_node/drawnode.c 2011-01-10 10:33:39 UTC (rev 34223)
@@ -1773,11 +1773,11 @@
void ED_init_node_butfuncs(void)
{
- bNodeTreeTypeInfo *treetype;
+ bNodeTreeType *treetype;
bNodeType *ntype;
/* XXX should be replaced by generic function for all tree types */
- treetype= ntreeGetTypeInfo(NTREE_SHADER);
+ treetype= ntreeGetType(NTREE_SHADER);
/* shader nodes */
ntype= treetype->node_types.first;
while(ntype) {
@@ -1785,7 +1785,7 @@
ntype= ntype->next;
}
- treetype= ntreeGetTypeInfo(NTREE_TEXTURE);
+ treetype= ntreeGetType(NTREE_TEXTURE);
/* composite nodes */
ntype= treetype->node_types.first;
while(ntype) {
@@ -1793,7 +1793,7 @@
ntype= ntype->next;
}
- treetype= ntreeGetTypeInfo(NTREE_COMPOSIT);
+ treetype= ntreeGetType(NTREE_COMPOSIT);
/* texture nodes */
ntype= treetype->node_types.first;
while(ntype) {
@@ -1801,7 +1801,7 @@
ntype= ntype->next;
}
- treetype= ntreeGetTypeInfo(NTREE_SIMULATION);
+ treetype= ntreeGetType(NTREE_SIMULATION);
/* texture nodes */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list