diff options
| author | Paul Lemire <paul.lemire.ecortex.kdab.com> | 2014-10-28 12:28:15 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-30 17:22:45 +0100 |
| commit | e283b32794f31ca6fc7061a34676911e771d2705 (patch) | |
| tree | 710beaa887cc55c38a04c57d4fbe82e71e2fe497 | |
| parent | 829440d0dcea15ab0deeea3e9532f1ca7d3eb99a (diff) | |
| download | qt3d-e283b32794f31ca6fc7061a34676911e771d2705.tar.gz | |
QAbstractCollider: renamed CollisionBehavior values
Change-Id: I87c4652ed3e78b5a661edf37c826bedd50a5ce4f
Task-number: QTBUG-41545
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/bulletphysics/qabstractcollider.cpp | 2 | ||||
| -rw-r--r-- | src/bulletphysics/qabstractcollider.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bulletphysics/qabstractcollider.cpp b/src/bulletphysics/qabstractcollider.cpp index 599dc7b4a..9d499e7b6 100644 --- a/src/bulletphysics/qabstractcollider.cpp +++ b/src/bulletphysics/qabstractcollider.cpp @@ -49,7 +49,7 @@ namespace BulletPhysics { QAbstractColliderPrivate::QAbstractColliderPrivate(QAbstractCollider *qq) : Qt3D::QComponentPrivate(qq) - , m_collisionBehavior(QAbstractCollider::SolidColliderBehavior) + , m_collisionBehavior(QAbstractCollider::NotifyOnly) { } diff --git a/src/bulletphysics/qabstractcollider.h b/src/bulletphysics/qabstractcollider.h index d40a3543d..428bea991 100644 --- a/src/bulletphysics/qabstractcollider.h +++ b/src/bulletphysics/qabstractcollider.h @@ -63,8 +63,8 @@ public: explicit QAbstractCollider(QNode *parent = 0); enum CollisionBehavior { - SolidColliderBehavior = 0, - NonSolidColliderBehavior + NotifyOnly = 0, + NotifyAndPreventIntersection }; void setCollisionBehavior(CollisionBehavior collisionBehavior); |