From 13b5ca56d65339b45d6a761fefcce6e5e14be730 Mon Sep 17 00:00:00 2001
From: John Cote <jwcotejr@gmail.com>
Date: Sat, 4 Dec 2021 23:04:23 -0500
Subject: [PATCH] nametag: Update MarginManager to comply with
 fac6916151cd148c4c8b69aa037962bebe1d7138

---
 panda/src/nametag/marginManager.cxx | 19 +------------------
 panda/src/nametag/marginManager.h   |  1 -
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/panda/src/nametag/marginManager.cxx b/panda/src/nametag/marginManager.cxx
index 135fceef78..67ef6b5d0b 100644
--- a/panda/src/nametag/marginManager.cxx
+++ b/panda/src/nametag/marginManager.cxx
@@ -25,6 +25,7 @@ TypeHandle MarginManager::_type_handle;
 MarginManager::
 MarginManager() : PandaNode("popups") {
   set_cull_callback();
+  set_renderable();
 
   _num_available_cells = 0;
 
@@ -432,24 +433,6 @@ cull_callback(CullTraverser *, CullTraverserData &) {
   return true;
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: MarginManager::is_renderable
-//       Access: Public, Virtual
-//  Description: Returns true if there is some value to visiting this
-//               particular node during the cull traversal for any
-//               camera, false otherwise.  This will be used to
-//               optimize the result of get_net_draw_show_mask(), so
-//               that any subtrees that contain only nodes for which
-//               is_renderable() is false need not be visited.
-////////////////////////////////////////////////////////////////////
-bool MarginManager::
-is_renderable() const {
-  // We flag the MarginManager as renderable, even though it
-  // technically doesn't have anything to render, but we do need the
-  // traverser to visit it every frame.
-  return true;
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: MarginManager::write
 //       Access: Published, Virtual
diff --git a/panda/src/nametag/marginManager.h b/panda/src/nametag/marginManager.h
index 0a33f737df..262838d5a5 100644
--- a/panda/src/nametag/marginManager.h
+++ b/panda/src/nametag/marginManager.h
@@ -49,7 +49,6 @@ public:
 public:
   // From base class PandaNode.
   virtual bool cull_callback(CullTraverser *trav, CullTraverserData &data);
-  virtual bool is_renderable() const;
 
   virtual void write(std::ostream &out, int indent_level) const;