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:
authorCampbell Barton <ideasman42@gmail.com>2018-06-01 19:26:42 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-01 19:26:42 +0300
commitbfe1d0e0dc6281d33448c3d4ddfa2e231bbc5566 (patch)
tree14e9db1c58d7ffc33becc3ff5d74f4feb4c2d75e /source/blender/collada/AnimationImporter.cpp
parent297bf7235bc4b2384b99f41676a8c217f2ee3249 (diff)
parent75fc1c35070e0cf247f2d2e4cffe8a6e711522ff (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/AnimationImporter.cpp')
-rw-r--r--source/blender/collada/AnimationImporter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp
index f37b0ee1319..c9b2f6d6d55 100644
--- a/source/blender/collada/AnimationImporter.cpp
+++ b/source/blender/collada/AnimationImporter.cpp
@@ -869,7 +869,7 @@ void AnimationImporter::apply_matrix_curves(Object *ob, std::vector<FCurve *>& a
/*
* This function returns the aspet ration from the Collada camera.
*
- * Note:COLLADA allows to specify either XFov, or YFov alone.
+ * Note:COLLADA allows to specify either XFov, or YFov alone.
* In that case the aspect ratio can be determined from
* the viewport aspect ratio (which is 1:1 ?)
* XXX: check this: its probably wrong!