Merge remote-tracking branch 'refs/remotes/origin/development' into development

engine/source/2d/controllers/BuoyancyController.cc

@@ -173,7 +173,7 @@ void BuoyancyController::integrate( Scene* pScene, const F32 totalTime, const F3
 
 		areaCenter.x /= area;
 		areaCenter.y /= area;
-        const b2Vec2 localCentroid = b2MulT(pSceneObject->getTransform(), areaCenter);
+        //const b2Vec2 localCentroid = b2MulT(pSceneObject->getTransform(), areaCenter);
 		massCenter.x /= mass;
 		massCenter.y /= mass;
 

engine/source/persistence/taml/tamlCustom.h

@@ -524,7 +524,6 @@ public:
         if ( deleteIfNotType && pTypeCast == NULL )
         {
             mpProxyObject->deleteObject();
-            const_cast<SimObject*>(mpProxyObject) = NULL;
             return NULL;
         }