diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-07-03 13:49:12 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-07-03 13:49:12 +0400 |
| commit | 21a5ea85cd02dd63ee4973a09032fd81d125ce63 (patch) | |
| tree | b6bd3c01e250ec197f7bd8f4ae91fe4d535410a5 /source | |
| parent | c21b1c78ebbf5d1c220c58b004779682583df95e (diff) | |
* Fix for Matt's fix!
The "generator" class for nodes then better completely disappears, also
from theme color choices menu. Since there was room for it, made the
generator themecolor to become color for 'Convertor' node types.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 1 | ||||
| -rw-r--r-- | source/blender/include/BIF_resources.h | 2 | ||||
| -rw-r--r-- | source/blender/src/drawnode.c | 6 | ||||
| -rw-r--r-- | source/blender/src/resources.c | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 4bba500cc16..bc9f0314658 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -82,7 +82,6 @@ typedef struct bNodeType { /* nodetype->nclass, for add-menu and themes */ #define NODE_CLASS_INPUT 0 #define NODE_CLASS_OUTPUT 1 -#define NODE_CLASS_GENERATOR 2 #define NODE_CLASS_OP_COLOR 3 #define NODE_CLASS_OP_VECTOR 4 #define NODE_CLASS_OP_FILTER 5 diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h index 8c108df442e..76a54de5e7e 100644 --- a/source/blender/include/BIF_resources.h +++ b/source/blender/include/BIF_resources.h @@ -463,7 +463,7 @@ enum { TH_NODE, TH_NODE_IN_OUT, TH_NODE_OPERATOR, - TH_NODE_GENERATOR, + TH_NODE_CONVERTOR, TH_NODE_GROUP, TH_SEQ_MOVIE, diff --git a/source/blender/src/drawnode.c b/source/blender/src/drawnode.c index 205aa815b96..a0da2d41ba4 100644 --- a/source/blender/src/drawnode.c +++ b/source/blender/src/drawnode.c @@ -1431,9 +1431,9 @@ static int node_get_colorid(bNode *node) else return TH_NODE; } - if(node->typeinfo->nclass==NODE_CLASS_GENERATOR) - return TH_NODE_GENERATOR; - if(ELEM4(node->typeinfo->nclass, NODE_CLASS_OP_COLOR, NODE_CLASS_OP_VECTOR, NODE_CLASS_OP_FILTER, NODE_CLASS_CONVERTOR)) + if(node->typeinfo->nclass==NODE_CLASS_CONVERTOR) + return TH_NODE_CONVERTOR; + if(ELEM3(node->typeinfo->nclass, NODE_CLASS_OP_COLOR, NODE_CLASS_OP_VECTOR, NODE_CLASS_OP_FILTER)) return TH_NODE_OPERATOR; if(node->typeinfo->nclass==NODE_CLASS_GROUP) return TH_NODE_GROUP; diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c index ee3f36d21c3..06e2273b591 100644 --- a/source/blender/src/resources.c +++ b/source/blender/src/resources.c @@ -285,7 +285,7 @@ char *BIF_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) cp= ts->syntaxn; break; case TH_NODE_OPERATOR: cp= ts->syntaxb; break; - case TH_NODE_GENERATOR: + case TH_NODE_CONVERTOR: cp= ts->syntaxv; break; case TH_NODE_GROUP: cp= ts->syntaxc; break; @@ -664,7 +664,7 @@ char *BIF_ThemeColorsPup(int spacetype) str += sprintf(str, "%%l|"); str += sprintf(str, "Node Backdrop %%x%d|", TH_NODE); str += sprintf(str, "In/Out Node %%x%d|", TH_NODE_IN_OUT); - str += sprintf(str, "Generator Node %%x%d|", TH_NODE_GENERATOR); + str += sprintf(str, "Convertor Node %%x%d|", TH_NODE_CONVERTOR); str += sprintf(str, "Operator Node %%x%d|", TH_NODE_OPERATOR); str += sprintf(str, "Group Node %%x%d|", TH_NODE_GROUP); break; |