Cleanup: explicit names for return arguments and position last

1 files changed, 18 insertions, 16 deletions

diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index 807a4a2201a..2fa8c1dcf49 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -296,9 +296,11 @@ DRWShadingGroup *shgroup_spot_instance(DRWPass *pass, struct Batch *geom)
 /* ******************************************** COLOR UTILS *********************************************** */
 
 /* TODO FINISH */
-/* Get the wire color theme_id of an object based on it's state
- * **color is a way to get a pointer to the static color var associated */
-int DRW_object_wire_theme_get(Object *ob, SceneLayer *sl, float **color)
+/**
+ * Get the wire color theme_id of an object based on it's state
+ * \a r_color is a way to get a pointer to the static color var associated
+ */
+int DRW_object_wire_theme_get(Object *ob, SceneLayer *sl, float **r_color)
 {
 	const bool is_edit = (ob->mode & OB_MODE_EDIT) != 0;
 	const bool active = (sl->basact && sl->basact->object == ob);
@@ -338,24 +340,24 @@ int DRW_object_wire_theme_get(Object *ob, SceneLayer *sl, float **color)
 		}
 	}
 
-	if (color != NULL) {
+	if (r_color != NULL) {
 		switch (theme_id) {
-			case TH_WIRE_EDIT:    *color = ts.colorTransform; break;
-			case TH_ACTIVE:       *color = ts.colorActive; break;
-			case TH_SELECT:       *color = ts.colorSelect; break;
-			case TH_GROUP:        *color = ts.colorGroup; break;
-			case TH_GROUP_ACTIVE: *color = ts.colorGroupActive; break;
-			case TH_TRANSFORM:    *color = ts.colorTransform; break;
-			case OB_SPEAKER:      *color = ts.colorSpeaker; break;
-			case OB_CAMERA:       *color = ts.colorCamera; break;
-			case OB_EMPTY:        *color = ts.colorEmpty; break;
-			case OB_LAMP:         *color = ts.colorLamp; break;
-			default:              *color = ts.colorWire; break;
+			case TH_WIRE_EDIT:    *r_color = ts.colorTransform; break;
+			case TH_ACTIVE:       *r_color = ts.colorActive; break;
+			case TH_SELECT:       *r_color = ts.colorSelect; break;
+			case TH_GROUP:        *r_color = ts.colorGroup; break;
+			case TH_GROUP_ACTIVE: *r_color = ts.colorGroupActive; break;
+			case TH_TRANSFORM:    *r_color = ts.colorTransform; break;
+			case OB_SPEAKER:      *r_color = ts.colorSpeaker; break;
+			case OB_CAMERA:       *r_color = ts.colorCamera; break;
+			case OB_EMPTY:        *r_color = ts.colorEmpty; break;
+			case OB_LAMP:         *r_color = ts.colorLamp; break;
+			default:              *r_color = ts.colorWire; break;
 		}
 
 		/* uses darker active color for non-active + selected */
 		if ((theme_id == TH_GROUP_ACTIVE) && !active) {
-			*color = ts.colorGroupSelect;
+			*r_color = ts.colorGroupSelect;
 		}
 	}