[Bf-blender-cvs] [38e1953] master: Fix compile warning in 04b369

[Porteries Tristan]

Commit: 38e19536bf6dd33cf73578260b17c5bc9d5db268
Author: Porteries Tristan
Date:   Sat Jul 25 14:00:46 2015 +0200
Branches: master
https://developer.blender.org/rB38e19536bf6dd33cf73578260b17c5bc9d5db268

Fix compile warning in 04b369

===================================================================

M	source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp

===================================================================

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
index 2c8b862..759e8bd 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -2989,7 +2989,7 @@ float		CcdPhysicsEnvironment::getAppliedImpulse(int	constraintid)
 {
 	// For soft body constraints
 	if (constraintid == 0)
-		return NULL;
+		return 0.0f;
 
 	int i;
 	int numConstraints = m_dynamicsWorld->getNumConstraints();