From 5c11a9451184d69a801a9c5663ccc58d4d7c1082 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Fri, 28 Feb 2014 00:29:57 +1100
Subject: [PATCH] Fix 32bit Windows non-debug build with MSVC 11.0 crash during
 startup.

---
 libs/openengine/bullet/physic.cpp | 6 +++---
 libs/openengine/bullet/physic.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index 481b99badb..f124abb990 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -23,7 +23,7 @@ namespace Physic
         mBody = mEngine->createAndAdjustRigidBody(mMesh, mName, scale, position, rotation, &mBoxScaledTranslation, &mBoxRotation);
         mRaycastingBody = mEngine->createAndAdjustRigidBody(mMesh, mName, scale, position, rotation, &mBoxScaledTranslation, &mBoxRotation, true);
         Ogre::Quaternion inverse = mBoxRotation.Inverse();
-        mBoxRotationInverse = btQuaternion(inverse.x, inverse.y, inverse.z,inverse.w);
+        mBoxRotationInverse = Ogre::Quaternion(inverse.w, inverse.x, inverse.y,inverse.z);
         mEngine->addRigidBody(mBody, false, mRaycastingBody,true);  //Add rigid body to dynamics world, but do not add to object map
     }
 
@@ -85,8 +85,8 @@ namespace Physic
     Ogre::Quaternion PhysicActor::getRotation()
     {
         assert(mBody);
-        btQuaternion quat = mBody->getWorldTransform().getRotation() * mBoxRotationInverse;
-        return Ogre::Quaternion(quat.getW(), quat.getX(), quat.getY(), quat.getZ());
+        btQuaternion quat = mBody->getWorldTransform().getRotation();
+        return Ogre::Quaternion(quat.getW(), quat.getX(), quat.getY(), quat.getZ()) * mBoxRotationInverse;
     }
 
     void PhysicActor::setScale(float scale){
diff --git a/libs/openengine/bullet/physic.hpp b/libs/openengine/bullet/physic.hpp
index 6cd7244b85..4ef611dc87 100644
--- a/libs/openengine/bullet/physic.hpp
+++ b/libs/openengine/bullet/physic.hpp
@@ -162,7 +162,7 @@ namespace Physic
 
         Ogre::Vector3 mBoxScaledTranslation;
         Ogre::Quaternion mBoxRotation;
-        btQuaternion mBoxRotationInverse;
+        Ogre::Quaternion mBoxRotationInverse;
 
         Ogre::Vector3 mForce;
         bool mOnGround;