diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-16 06:56:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-16 06:56:03 +0300 |
| commit | 873a87c7e8f96e3f6785d90144182356b3fef7cd (patch) | |
| tree | 590281363041582f796770466b0f898e4e905fbd /source/blender/collada/AnimationImporter.cpp | |
| parent | 1e9bc60777421b861852f9289d1ca71a69bedc3f (diff) | |
| parent | e428ea3e0055dd95445694a72ff5c6b491a46ec7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/AnimationImporter.cpp')
| -rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 5e6fe84d3a9..65acce41046 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -816,10 +816,11 @@ void AnimationImporter::apply_matrix_curves(Object *ob, std::vector<FCurve *>& a float rot[4], loc[3], scale[3]; mat4_to_quat(rot, mat); - /*for ( int i = 0 ; i < 4 ; i ++ ) - { - rot[i] = RAD2DEGF(rot[i]); - }*/ +#if 0 + for (int i = 0 ; i < 4; i++) { + rot[i] = RAD2DEGF(rot[i]); + } +#endif copy_v3_v3(loc, mat[3]); mat4_to_size(scale, mat); |