[Bf-blender-cvs] [71dcaa7] master: BGE Cleanup: Identical code for both if/else branches

Jorge Bernal noreply at git.blender.org
Sat May 30 18:16:10 CEST 2015


Commit: 71dcaa77446b5005d8b4d8f2afa94acfc3e21beb
Author: Jorge Bernal
Date:   Sat May 30 18:14:32 2015 +0200
Branches: master
https://developer.blender.org/rB71dcaa77446b5005d8b4d8f2afa94acfc3e21beb

BGE Cleanup: Identical code for both if/else branches

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

M	source/gameengine/GameLogic/SCA_PropertySensor.cpp

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

diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.cpp b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
index 6f34f87..6841d2a 100644
--- a/source/gameengine/GameLogic/SCA_PropertySensor.cpp
+++ b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
@@ -265,13 +265,8 @@ bool	SCA_PropertySensor::CheckPropertyCondition()
 
 	//the concept of Edge and Level triggering has unwanted effect for KX_PROPSENSOR_CHANGED
 	//see Game Engine bugtracker [ #3809 ]
-	if (m_checktype != KX_PROPSENSOR_CHANGED)
-	{
-		m_recentresult=result;
-	} else
-	{
-		m_recentresult=result;//true;
-	}
+	m_recentresult = result;
+
 	return result;
 }




More information about the Bf-blender-cvs mailing list