diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-27 12:04:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-27 12:04:07 +0400 |
| commit | 2247465b997f80eb7b4e57b9cb1a973d8fbfa4a8 (patch) | |
| tree | e32b5865a12016fb5596112857e6e3fed8b74e19 /source/blender/nodes/texture | |
| parent | d612fc04267ca035930eddbfa431f567599baa2c (diff) | |
style cleanup: nodes
Diffstat (limited to 'source/blender/nodes/texture')
| -rw-r--r-- | source/blender/nodes/texture/node_texture_tree.c | 6 | ||||
| -rw-r--r-- | source/blender/nodes/texture/node_texture_util.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index 6636957facb..94589c927b3 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -72,9 +72,9 @@ static void texture_get_from_context(const bContext *C, bNodeTreeType *UNUSED(tr tx = give_current_object_texture(ob); if (tx) { if (ob->type == OB_LAMP) - *r_from = (ID*)ob->data; + *r_from = (ID *)ob->data; else - *r_from = (ID*)give_current_material(ob, ob->actcol); + *r_from = (ID *)give_current_material(ob, ob->actcol); /* from is not set fully for material nodes, should be ID + Node then */ *r_id = &tx->id; @@ -169,7 +169,7 @@ void register_node_tree_type_tex(void) tt->type = NTREE_TEXTURE; strcpy(tt->idname, "TextureNodeTree"); strcpy(tt->ui_name, "Texture"); - tt->ui_icon = 0; /* defined in drawnode.c */ + tt->ui_icon = 0; /* defined in drawnode.c */ strcpy(tt->ui_description, ""); tt->foreach_nodeclass = foreach_nodeclass; diff --git a/source/blender/nodes/texture/node_texture_util.c b/source/blender/nodes/texture/node_texture_util.c index 80644157b02..a8117b7b333 100644 --- a/source/blender/nodes/texture/node_texture_util.c +++ b/source/blender/nodes/texture/node_texture_util.c @@ -52,7 +52,7 @@ int tex_node_poll_default(bNodeType *UNUSED(ntype), bNodeTree *ntree) { - return (strcmp(ntree->idname, "TextureNodeTree")==0); + return STREQ(ntree->idname, "TextureNodeTree"); } void tex_node_type_base(struct bNodeType *ntype, int type, const char *name, short nclass, short flag) |