Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2013-12-02 00:30:04 +0400
committerJeroen Bakker <j.bakker@atmind.nl>2013-12-09 23:22:15 +0400
commitf120adf65ce5085ec54350b1633b25533881a251 (patch)
tree4db2fe06a31db9e1c008a12a80710da24df20d57 /source/blender/editors/space_node/node_draw.c
parenta930fb154f47a7473848254ad0b0b83c9edd1850 (diff)
Enhancement: added node colors for every node class
In the user preferences all node classes can get its own color The in/out color is splitted into 2 sepatate colors the rna has been updated to better names
Diffstat (limited to 'source/blender/editors/space_node/node_draw.c')
-rw-r--r--source/blender/editors/space_node/node_draw.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 6f2f8dee105..5ca853e6020 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -562,16 +562,21 @@ int node_tweak_area_default(bNode *node, int x, int y)
int node_get_colorid(bNode *node)
{
switch (node->typeinfo->nclass) {
- case NODE_CLASS_INPUT: return TH_NODE_IN_OUT;
- case NODE_CLASS_OUTPUT: return (node->flag & NODE_DO_OUTPUT) ? TH_NODE_IN_OUT : TH_NODE;
+ case NODE_CLASS_INPUT: return TH_NODE_INPUT;
+ case NODE_CLASS_OUTPUT: return (node->flag & NODE_DO_OUTPUT) ? TH_NODE_OUTPUT : TH_NODE;
case NODE_CLASS_CONVERTOR: return TH_NODE_CONVERTOR;
- case NODE_CLASS_OP_COLOR:
- case NODE_CLASS_OP_VECTOR:
- case NODE_CLASS_OP_FILTER: return TH_NODE_OPERATOR;
+ case NODE_CLASS_OP_COLOR: return TH_NODE_COLOR;
+ case NODE_CLASS_OP_VECTOR: return TH_NODE_VECTOR;
+ case NODE_CLASS_OP_FILTER: return TH_NODE_FILTER;
case NODE_CLASS_GROUP: return TH_NODE_GROUP;
case NODE_CLASS_INTERFACE: return TH_NODE_INTERFACE;
case NODE_CLASS_MATTE: return TH_NODE_MATTE;
case NODE_CLASS_DISTORT: return TH_NODE_DISTORT;
+ case NODE_CLASS_TEXTURE: return TH_NODE_TEXTURE;
+ case NODE_CLASS_SHADER: return TH_NODE_SHADER;
+ case NODE_CLASS_SCRIPT: return TH_NODE_SCRIPT;
+ case NODE_CLASS_PATTERN: return TH_NODE_PATTERN;
+ case NODE_CLASS_LAYOUT: return TH_NODE_LAYOUT;
default: return TH_NODE;
}
}