From 64fbd50e4cc23dfb6f8ab5014e1e924136522079 Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Sat, 17 Mar 2018 14:16:19 +0100 Subject: Refactor: Collada: remove param, changed order of params in Function call * In the Collada Module parameters are typically ordered in a similar way. I changed this to: extern std::string get_joint_id(Object *ob, Bone *bone); * The Object parameter was not used in get_joint_sid(). I changed this to: extern std::string get_joint_sid(Bone *bone); --- source/blender/collada/collada_internal.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/collada/collada_internal.cpp') diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp index 8974acb3460..f2cc56777d8 100644 --- a/source/blender/collada/collada_internal.cpp +++ b/source/blender/collada/collada_internal.cpp @@ -327,12 +327,12 @@ std::string get_light_id(Object *ob) return translate_id(id_name(ob)) + "-light"; } -std::string get_joint_id(Bone *bone, Object *ob_arm) +std::string get_joint_id(Object *ob, Bone *bone) { - return translate_id(id_name(ob_arm) + "_" + bone->name); + return translate_id(id_name(ob) + "_" + bone->name); } -std::string get_joint_sid(Bone *bone, Object *ob_arm) +std::string get_joint_sid(Bone *bone) { return translate_id(bone->name); } -- cgit v1.2.3