diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2017-03-21 20:05:10 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2017-03-23 16:14:22 +0300 |
| commit | 339d0170d1843e6a67217cfc4085af8725708eca (patch) | |
| tree | bea933748afd0ee880538ac485bac7af6d631e9c /source/blender/collada/TransformReader.h | |
| parent | 1729dd99981ad2d35582ebb67d32542a0e0b24bd (diff) | |
collada: Simplify reading Node Matrix
Diffstat (limited to 'source/blender/collada/TransformReader.h')
| -rw-r--r-- | source/blender/collada/TransformReader.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/collada/TransformReader.h b/source/blender/collada/TransformReader.h index ab974b9ba85..c598c466c9b 100644 --- a/source/blender/collada/TransformReader.h +++ b/source/blender/collada/TransformReader.h @@ -59,7 +59,8 @@ public: TransformReader(UnitConverter *conv); void get_node_mat(float mat[4][4], COLLADAFW::Node *node, std::map<COLLADAFW::UniqueId, Animation> *animation_map, Object *ob); - + void get_node_mat(float mat[4][4], COLLADAFW::Node *node, std::map<COLLADAFW::UniqueId, Animation> *animation_map, Object *ob, float parent_mat[4][4]); + void dae_rotate_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); void dae_translate_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); void dae_scale_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); |