diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-17 16:24:06 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-17 16:24:06 +0300 |
| commit | 9ed7093aa639f31e9ba5b146d2d88bae942ab424 (patch) | |
| tree | 3ec4d0be0cabd2a43c8d4b33fd98f8eb190382a1 /source/blender/collada/collada_internal.h | |
| parent | dc08df659eaadd6c59c89f268aad9cd103e1e7e5 (diff) | |
| parent | 64fbd50e4cc23dfb6f8ab5014e1e924136522079 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/collada_internal.h')
| -rw-r--r-- | source/blender/collada/collada_internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h index 1c7aa160f57..299e13326ce 100644 --- a/source/blender/collada/collada_internal.h +++ b/source/blender/collada/collada_internal.h @@ -97,8 +97,8 @@ extern std::string get_geometry_id(Object *ob, bool use_instantiation); extern std::string get_light_id(Object *ob); -extern std::string get_joint_id(Bone *bone, Object *ob_arm); -extern std::string get_joint_sid(Bone *bone, Object *ob_arm); +extern std::string get_joint_id(Object *ob, Bone *bone); +extern std::string get_joint_sid(Bone *bone); extern std::string get_camera_id(Object *ob); |