[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49566] trunk/blender/source/blender/ collada: COLLADA: fix for #32251.

[Gaia Clary]

Revision: 49566
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49566
Author:   gaiaclary
Date:     2012-08-04 22:18:56 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
COLLADA: fix for #32251. This seems to be compliant to the Collada 1.4.1 specification.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/CameraExporter.cpp
    trunk/blender/source/blender/collada/DocumentImporter.cpp

Modified: trunk/blender/source/blender/collada/CameraExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/CameraExporter.cpp	2012-08-04 21:25:19 UTC (rev 49565)
+++ trunk/blender/source/blender/collada/CameraExporter.cpp	2012-08-04 22:18:56 UTC (rev 49566)
@@ -84,7 +84,7 @@
 		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");

Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.cpp	2012-08-04 21:25:19 UTC (rev 49565)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp	2012-08-04 22:18:56 UTC (rev 49566)
@@ -846,7 +846,7 @@
 			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 @@
 		{
 			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: