kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

COLLADA: fix for #32251. This seems to be compliant to the Collada 1.4.1 specification.

Browse Source
This commit is contained in:
Gaia Clary 2012-08-04 22:18:56 +00:00
parent 021dd5fb40
commit 9090340175
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/collada/CameraExporter.cpp
View File

@ -84,7 +84,7 @@ void CamerasExporter::operator()(Object *ob, Scene *sce)
default:
{
COLLADASW::OrthographicOptic ortho(mSW);
ortho.setXMag(cam->ortho_scale, "xmag");
ortho.setXMag(cam->ortho_scale / 2, "xmag");
ortho.setAspectRatio((float)(sce->r.xsch) / (float)(sce->r.ysch), false, "aspect_ratio");
ortho.setZFar(cam->clipend, false, "zfar");
ortho.setZNear(cam->clipsta, false, "znear");

4
source/blender/collada/DocumentImporter.cpp
View File

@ -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: