Merge remote branch 'upstream/collision' into collision

apps/openmw/mwrender/mwscene.cpp

@@ -166,12 +166,16 @@ void MWScene::moveObject (const std::string& handle, const Ogre::Vector3& positi
 
     if(updatePhysics)//TODO: is it an actor?
     {
-		OEngine::Physic::RigidBody* body = eng->getRigidBody(handle);
+        if (OEngine::Physic::RigidBody* body = eng->getRigidBody(handle))
+        {
+            // TODO very dirty hack to avoid crash during setup -> needs cleaning up to allow
+            // start positions others than 0, 0, 0
             btTransform tr = body->getWorldTransform();
             tr.setOrigin(btVector3(position.x,position.y,position.z));
             body->setWorldTransform(tr);
         }
     }
+}
 
 void MWScene::rotateObject (const std::string& handle, const Ogre::Quaternion& rotation)
 {

apps/openmw/mwworld/doingphysics.cpp

@@ -18,7 +18,7 @@ namespace MWWorld
 
     bool DoingPhysics::isDoingPhysics()
     {
-        return sCounter>0 || sSuppress>0;
+        return sCounter>0 && sSuppress==0;
     }
 
     SuppressDoingPhysics::SuppressDoingPhysics()