UPBGE: Rename DefaultFilter to DynamicFilter.

UPBGE · Jul 21, 2018 · 1851639 · 1851639
1 parent 7a791c9
commit 1851639
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -208,13 +208,13 @@ struct CcdConstructionInfo {
 	 */
 	enum CollisionFilterGroups
 	{
-		DefaultFilter = 1,
+		DynamicFilter = 1,
 		StaticFilter = 2,
 		KinematicFilter = 4,
 		DebrisFilter = 8,
 		SensorFilter = 16,
 		CharacterFilter = 32,
-		AllFilter = DefaultFilter | StaticFilter | KinematicFilter | DebrisFilter | SensorFilter | CharacterFilter,
+		AllFilter = DynamicFilter | StaticFilter | KinematicFilter | DebrisFilter | SensorFilter | CharacterFilter,
 	};
 
 	CcdConstructionInfo()
@@ -268,7 +268,7 @@ struct CcdConstructionInfo {
 		m_bSensor(false),
 		m_bCharacter(false),
 		m_bGimpact(false),
-		m_collisionFilterGroup(DefaultFilter),
+		m_collisionFilterGroup(DynamicFilter),
 		m_collisionFilterMask(AllFilter),
 		m_collisionGroup(0xFFFF),
 		m_collisionMask(0xFFFF),

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -3078,7 +3078,7 @@ void CcdPhysicsEnvironment::ConvertObject(BL_SceneConverter& converter, KX_GameO
 
 	ci.m_collisionFilterGroup =
 		(isbulletsensor) ? short(CcdConstructionInfo::SensorFilter) :
-		(isbulletdyna) ? short(CcdConstructionInfo::DefaultFilter) :
+		(isbulletdyna) ? short(CcdConstructionInfo::DynamicFilter) :
 		(isbulletchar) ? short(CcdConstructionInfo::CharacterFilter) :
 		short(CcdConstructionInfo::StaticFilter);
 	ci.m_collisionFilterMask =