From 9a7e103c339aaaffdc4fa4873143ae85f2103563 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 2 Nov 2019 20:42:44 +0100 Subject: [PATCH] collide: restore missing CollisionTraverser.showCollisions() This was an accidental regression in e48a40abad5399c7c3a0abffe1dfb3256b9a2317 which unexposed CollisionVisualizer and therefore caused this method to no longer be wrapped by Interrogate. --- panda/src/collide/collisionTraverser.cxx | 2 +- panda/src/collide/collisionTraverser.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panda/src/collide/collisionTraverser.cxx b/panda/src/collide/collisionTraverser.cxx index a09d7b645a..46c06b8829 100644 --- a/panda/src/collide/collisionTraverser.cxx +++ b/panda/src/collide/collisionTraverser.cxx @@ -399,7 +399,7 @@ set_recorder(CollisionRecorder *recorder) { * should be any node in the scene graph; typically, the top node (e.g. * render). The CollisionVisualizer will be attached to this node. */ -CollisionVisualizer *CollisionTraverser:: +PandaNode *CollisionTraverser:: show_collisions(const NodePath &root) { #ifdef DO_COLLISION_RECORDING hide_collisions(); diff --git a/panda/src/collide/collisionTraverser.h b/panda/src/collide/collisionTraverser.h index cb12d6d4e9..b1be66d49f 100644 --- a/panda/src/collide/collisionTraverser.h +++ b/panda/src/collide/collisionTraverser.h @@ -72,7 +72,7 @@ PUBLISHED: MAKE_PROPERTY2(recorder, has_recorder, get_recorder, set_recorder, clear_recorder); - CollisionVisualizer *show_collisions(const NodePath &root); + PandaNode *show_collisions(const NodePath &root); void hide_collisions(); #endif // DO_COLLISION_RECORDING