[Ogreaddons-svnmail] SF.net SVN: ogreaddons:[2970] branches/ogrenewt/newton20

[<kal...@us...>]

Revision: 2970
          http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2970&view=rev
Author:   kallaspriit
Date:     2010-09-13 19:37:48 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
Fixed a scaling issue.

Modified Paths:
--------------
    branches/ogrenewt/newton20/OgreNewt_VS9.suo
    branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp

Modified: branches/ogrenewt/newton20/OgreNewt_VS9.suo
===================================================================
(Binary files differ)

Modified: branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp
===================================================================
--- branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp	2010-09-09 19:50:14 UTC (rev 2969)
+++ branches/ogrenewt/newton20/src/OgreNewt_CollisionPrimitives.cpp	2010-09-13 19:37:48 UTC (rev 2970)
@@ -129,8 +129,9 @@
             Ogre::MeshPtr mesh = obj->getMesh();
 
             // get scale, if attached to node
-            Ogre::Node * node = obj->getParentNode();
-            if (node) scale = node->getScale();
+			Ogre::Node * node = obj->getParentNode();
+			if (node) scale = node->_getDerivedScale();
+
             if (forceScale != Ogre::Vector3::ZERO) scale = forceScale;
 
             //find number of submeshes
@@ -267,7 +268,7 @@
 
                         // get scale, if attached to node
                         Ogre::Node * node = obj->getParentNode();
-                        if (node) scale = node->getScale();
+                        if (node) scale = node->_getDerivedScale();
 
             //find number of sub-meshes
             unsigned short sub = mesh->getNumSubMeshes();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.