diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-17 03:39:29 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-17 03:39:29 +0300 |
commit | f2453ecdcd179fb696494d03501c0dd149ee1ed2 (patch) | |
tree | 23fdd70d99c95b5efab3fb258db77b68501aa059 /source/blender/collada/collada_utils.h | |
parent | 09eb790f4bbc89ceac0dda949f2f42a3c94883a4 (diff) | |
parent | 5bc2c17161cfc23ca2d8c58e7e24458c277100ae (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/collada_utils.h')
-rw-r--r-- | source/blender/collada/collada_utils.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index 5d6e836b9c3..e3a16105861 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -93,6 +93,7 @@ extern void bc_match_scale(Object *ob, UnitConverter &bc_unit, bool scale_to_sce extern void bc_match_scale(std::vector<Object *> *objects_done, UnitConverter &unit_converter, bool scale_to_scene); extern void bc_decompose(float mat[4][4], float *loc, float eul[3], float quat[4], float *size); +extern void bc_rotate_from_reference_quat(float quat_to[4], float quat_from[4], float mat_to[4][4]); extern void bc_triangulate_mesh(Mesh *me); extern bool bc_is_leaf_bone(Bone *bone); @@ -100,6 +101,7 @@ extern EditBone *bc_get_edit_bone(bArmature * armature, char *name); extern int bc_set_layer(int bitfield, int layer, bool enable); extern int bc_set_layer(int bitfield, int layer); extern void bc_sanitize_mat(float mat[4][4], int precision); +extern void bc_sanitize_mat(double mat[4][4], int precision); extern IDProperty *bc_get_IDProperty(Bone *bone, std::string key); extern void bc_set_IDProperty(EditBone *ebone, const char *key, float value); |