Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaia Clary <gaia.clary@machinimatrix.org>2018-03-17 16:16:19 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2018-03-17 16:16:19 +0300
commit64fbd50e4cc23dfb6f8ab5014e1e924136522079 (patch)
treee729a1bf5cd22e7cff787125206371f2ff4de958 /source/blender/collada/collada_internal.cpp
parent5389964eea27c4d0129171ee69129210ee522bc3 (diff)
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);
Diffstat (limited to 'source/blender/collada/collada_internal.cpp')
-rw-r--r--source/blender/collada/collada_internal.cpp6
1 files changed, 3 insertions, 3 deletions
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);
}