diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-08-05 02:18:56 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-08-05 02:18:56 +0400 |
| commit | 909034017525b0ee17fac3181b111782e70e88f6 (patch) | |
| tree | 90dd86197100aab644e88b5e553555b174271541 /source/blender/collada/DocumentImporter.cpp | |
| parent | 021dd5fb40663d1f9422adddc86c0886d32ae13e (diff) | |
COLLADA: fix for #32251. This seems to be compliant to the Collada 1.4.1 specification.
Diffstat (limited to 'source/blender/collada/DocumentImporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index ca07512f439..6aa600cabe2 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -846,7 +846,7 @@ bool DocumentImporter::writeCamera(const COLLADAFW::Camera *camera) switch (cam->type) { case CAM_ORTHO: { - double ymag = camera->getYMag().getValue(); + double ymag = 2 * camera->getYMag().getValue(); double aspect = camera->getAspectRatio().getValue(); double xmag = aspect * ymag; cam->ortho_scale = (float)xmag; @@ -873,7 +873,7 @@ bool DocumentImporter::writeCamera(const COLLADAFW::Camera *camera) { switch (cam->type) { case CAM_ORTHO: - cam->ortho_scale = (float)camera->getXMag().getValue(); + cam->ortho_scale = (float)camera->getXMag().getValue() * 2; break; case CAM_PERSP: default: |