Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgaiaclary <gaia.clary@machinimatrix.org>2014-01-31 12:35:00 +0400
committergaiaclary <gaia.clary@machinimatrix.org>2014-01-31 12:35:00 +0400
commitd291d15c193e98ad9fbc05832587bc17a191aa9e (patch)
treedf9b78e0d108015e6bacb759d6364635e5d1aee8 /source/blender/collada/AnimationImporter.cpp
parenta7b1349ce48b9f6a05ec8958f8096a0da2c89f25 (diff)
Fix for T32843
Exported angles for spot size animation is in radians , however Collada expects it to be in degrees. This patch is for fixing import and export, and also renaming a variable Reviewers: gaiaclary Reviewed By: gaiaclary Differential Revision: https://developer.blender.org/D273
Diffstat (limited to 'source/blender/collada/AnimationImporter.cpp')
-rw-r--r--source/blender/collada/AnimationImporter.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp
index 445199dbdef..66312f7299f 100644
--- a/source/blender/collada/AnimationImporter.cpp
+++ b/source/blender/collada/AnimationImporter.cpp
@@ -648,6 +648,12 @@ void AnimationImporter:: Assign_float_animations(const COLLADAFW::UniqueId& list
//Add the curves of the current animation to the object
for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
FCurve *fcu = *iter;
+ /* All anim_types whose values are to be converted from Degree to Radians can be ORed here
+ *XXX What About " rotation " ? */
+ if (BLI_strcaseeq("spot_size", anim_type)) {
+ /* Convert current values to Radians */
+ fcurve_deg_to_rad(fcu);
+ }
BLI_addtail(AnimCurves, fcu);
}
}