From 226d888ef49bf8458cdc40e7ec7fdee638e22ee8 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 3 May 2019 18:02:45 +0200 Subject: [PATCH] collide: remove doubly defined property due to faulty merge --- panda/src/collide/collisionTraverser.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/panda/src/collide/collisionTraverser.h b/panda/src/collide/collisionTraverser.h index df7f4b40ce..a51a1bd474 100644 --- a/panda/src/collide/collisionTraverser.h +++ b/panda/src/collide/collisionTraverser.h @@ -51,8 +51,6 @@ PUBLISHED: INLINE bool get_respect_prev_transform() const; MAKE_PROPERTY(respect_prev_transform, get_respect_prev_transform, set_respect_prev_transform); - MAKE_PROPERTY(respect_prev_transform, get_respect_prev_transform, - set_respect_prev_transform); void add_collider(const NodePath &collider, CollisionHandler *handler); bool remove_collider(const NodePath &collider);