diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-15 20:24:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-15 20:26:23 +0400 |
| commit | 2097e621edcf7658895b9f6ba9cc4e51f5538369 (patch) | |
| tree | 9f112e8a2b35fed01734ed355d3832cd857de826 /source/blender/editors/uvedit/uvedit_ops.c | |
| parent | 38244166b03bc4a01d8c0b99e2fd2cb2c9b60012 (diff) | |
Code cleanup: use r_ prefix for return args
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_ops.c')
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index ff2a2fcc156..fe398c00b6a 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -137,21 +137,22 @@ static bool is_image_texture_node(bNode *node) return ELEM(node->type, SH_NODE_TEX_IMAGE, SH_NODE_TEX_ENVIRONMENT); } -bool ED_object_get_active_image(Object *ob, int mat_nr, Image **ima, ImageUser **iuser, bNode **node_r) +bool ED_object_get_active_image(Object *ob, int mat_nr, + Image **r_ima, ImageUser **r_iuser, bNode **r_node) { Material *ma = give_current_material(ob, mat_nr); bNode *node = (ma && ma->use_nodes) ? nodeGetActiveTexture(ma->nodetree) : NULL; if (node && is_image_texture_node(node)) { - if (ima) *ima = (Image *)node->id; - if (iuser) *iuser = NULL; - if (node_r) *node_r = node; + if (r_ima) *r_ima = (Image *)node->id; + if (r_iuser) *r_iuser = NULL; + if (r_node) *r_node = node; return TRUE; } - if (ima) *ima = NULL; - if (iuser) *iuser = NULL; - if (node_r) *node_r = node; + if (r_ima) *r_ima = NULL; + if (r_iuser) *r_iuser = NULL; + if (r_node) *r_node = node; return FALSE; } |