From ef6937e69e8ee3f409cf9d460d5ad300a65d5924 Mon Sep 17 00:00:00 2001
From: sschirm <sschirm@nvidia.com>
Date: Fri, 23 Dec 2016 14:20:36 +0100
Subject: PhysX 3.4 / APEX 1.4 release candidate @21506124

---
 PhysX_3.4/Source/PhysX/src/NpFactory.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'PhysX_3.4/Source/PhysX/src/NpFactory.cpp')

diff --git a/PhysX_3.4/Source/PhysX/src/NpFactory.cpp b/PhysX_3.4/Source/PhysX/src/NpFactory.cpp
index bd026191..0d23052e 100644
--- a/PhysX_3.4/Source/PhysX/src/NpFactory.cpp
+++ b/PhysX_3.4/Source/PhysX/src/NpFactory.cpp
@@ -1231,23 +1231,23 @@ namespace physx
 	{
 		switch(base.getScbType())
 		{
-			case ScbType::SHAPE_EXCLUSIVE:
-			case ScbType::SHAPE_SHARED:					{ NpDestroyShape(static_cast<Scb::Shape&>(base));							}break;
-			case ScbType::BODY:							{ NpDestroyRigidDynamic(static_cast<Scb::Body&>(base));						}break;
-			case ScbType::BODY_FROM_ARTICULATION_LINK:	{ NpDestroyArticulationLink(static_cast<Scb::Body&>(base));					}break;
-			case ScbType::RIGID_STATIC:					{ NpDestroyRigidActor(static_cast<Scb::RigidStatic&>(base));				}break;
-			case ScbType::CONSTRAINT:					{ NpDestroyConstraint(static_cast<Scb::Constraint&>(base));					}break;
+			case ScbType::eSHAPE_EXCLUSIVE:
+			case ScbType::eSHAPE_SHARED:				{ NpDestroyShape(static_cast<Scb::Shape&>(base));							}break;
+			case ScbType::eBODY:						{ NpDestroyRigidDynamic(static_cast<Scb::Body&>(base));						}break;
+			case ScbType::eBODY_FROM_ARTICULATION_LINK:	{ NpDestroyArticulationLink(static_cast<Scb::Body&>(base));					}break;
+			case ScbType::eRIGID_STATIC:				{ NpDestroyRigidActor(static_cast<Scb::RigidStatic&>(base));				}break;
+			case ScbType::eCONSTRAINT:					{ NpDestroyConstraint(static_cast<Scb::Constraint&>(base));					}break;
 #if PX_USE_PARTICLE_SYSTEM_API
-			case ScbType::PARTICLE_SYSTEM:				{ NpDestroyParticleSystem(static_cast<Scb::ParticleSystem&>(base));			}break;
+			case ScbType::ePARTICLE_SYSTEM:				{ NpDestroyParticleSystem(static_cast<Scb::ParticleSystem&>(base));			}break;
 #endif
-			case ScbType::ARTICULATION:					{ NpDestroyArticulation(static_cast<Scb::Articulation&>(base));				}break;
-			case ScbType::ARTICULATION_JOINT:			{ NpDestroyArticulationJoint(static_cast<Scb::ArticulationJoint&>(base));	}break;
-			case ScbType::AGGREGATE:					{ NpDestroyAggregate(static_cast<Scb::Aggregate&>(base));					}break;
+			case ScbType::eARTICULATION:				{ NpDestroyArticulation(static_cast<Scb::Articulation&>(base));				}break;
+			case ScbType::eARTICULATION_JOINT:			{ NpDestroyArticulationJoint(static_cast<Scb::ArticulationJoint&>(base));	}break;
+			case ScbType::eAGGREGATE:					{ NpDestroyAggregate(static_cast<Scb::Aggregate&>(base));					}break;
 #if PX_USE_CLOTH_API
-			case ScbType::CLOTH:						{ NpDestroyCloth(static_cast<Scb::Cloth&>(base));							}break;
+			case ScbType::eCLOTH:						{ NpDestroyCloth(static_cast<Scb::Cloth&>(base));							}break;
 #endif
-			case ScbType::UNDEFINED:
-			case ScbType::TYPE_COUNT:
+			case ScbType::eUNDEFINED:
+			case ScbType::eTYPE_COUNT:
 				PX_ALWAYS_ASSERT_MESSAGE("NpDestroy: missing type!");
 				break;
 		}
-- 
cgit v1.2.3