From 2097e621edcf7658895b9f6ba9cc4e51f5538369 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 16 Mar 2014 03:24:05 +1100 Subject: Code cleanup: use r_ prefix for return args --- source/blender/editors/uvedit/uvedit_ops.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'source/blender/editors/uvedit/uvedit_ops.c') 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; } -- cgit v1.2.3