diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-28 18:56:09 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-03-28 19:01:32 +0300 |
| commit | 8afc9c1e7d1a38e819ea4b4d16faa3cd3539f6c4 (patch) | |
| tree | 2aa8b8cb02fe46d86566b13f4c7dfa7f5a94fb2d /source/blender/collada/AnimationImporter.h | |
| parent | bc3a55c3439c29a85af334c289ac2dcb35f08e07 (diff) | |
Fix Collada: broken tangents with Camera Animation import for xfov
When importing an xfov curve, we must transformed the data to
Lens opening angles in degrees. While the curve value itself is
correctly transformed, the transformation of the tangents has been
forgotten. this is fixed now.
Diffstat (limited to 'source/blender/collada/AnimationImporter.h')
| -rw-r--r-- | source/blender/collada/AnimationImporter.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h index 7dc4131dd69..1f2de2f3162 100644 --- a/source/blender/collada/AnimationImporter.h +++ b/source/blender/collada/AnimationImporter.h @@ -202,6 +202,8 @@ public: // gives a world-space mat, end's mat not included bool calc_joint_parent_mat_rest(float mat[4][4], float par[4][4], COLLADAFW::Node *node, COLLADAFW::Node *end); + float convert_to_focal_length(float in_xfov, int fov_type, float aspect, float sensorx); + #ifdef ARMATURE_TEST Object *get_joint_object(COLLADAFW::Node *root, COLLADAFW::Node *node, Object *par_job); #endif |