2.50:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD

Notes:
* Game and sequencer RNA, and sequencer header are now out of date
  a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
  not needed anymore.
  * Fix "duplicate strip" always increase the user count for ipo.
  * IPO pinning on sequencer strips was lost during Undo.

2 files changed, 9 insertions, 4 deletions

diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
index ba196b5cf55..e41574ff181 100644
--- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
@@ -57,7 +57,7 @@ void DummyPhysicsEnvironment::endFrame()
 
 
 
-bool		DummyPhysicsEnvironment::proceedDeltaTime(double  curTime,float timeStep)
+bool		DummyPhysicsEnvironment::proceedDeltaTime(double  curTime,float timeStep,float interval)
 {
 	//step physics simulation, typically perform
 	
diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
index 4e15e6ec130..8dbd137f9de 100644
--- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
@@ -48,7 +48,7 @@ public:
 	virtual void		beginFrame();
 	virtual void		endFrame();
 // Perform an integration step of duration 'timeStep'.
-	virtual	bool		proceedDeltaTime(double  curTime,float timeStep);
+	virtual	bool		proceedDeltaTime(double  curTime,float timeStep,float interval);
 	virtual	void		setFixedTimeStep(bool useFixedTimeStep,float fixedTimeStep);
 	virtual	float		getFixedTimeStep();
 
@@ -79,8 +79,8 @@ public:
 		virtual void addTouchCallback(int response_class, PHY_ResponseCallback callback, void *user)
 		{
 		}
-		virtual void requestCollisionCallback(PHY_IPhysicsController* ctrl) {}
-		virtual void removeCollisionCallback(PHY_IPhysicsController* ctrl) {}
+		virtual bool requestCollisionCallback(PHY_IPhysicsController* ctrl) { return false; }
+		virtual bool removeCollisionCallback(PHY_IPhysicsController* ctrl) { return false;}
 		virtual PHY_IPhysicsController*	CreateSphereController(float radius,const PHY__Vector3& position) {return 0;}
 		virtual PHY_IPhysicsController* CreateConeController(float coneradius,float coneheight) { return 0;}
 
@@ -88,6 +88,11 @@ public:
 		{
 		}
 
+		virtual float	getConstraintParam(int constraintId,int param)
+		{
+			return 0.f;
+		}
+
 };
 
 #endif //_DUMMYPHYSICSENVIRONMENT