From a1a5d04a554a4ddf8f4dbb3b07923f08fff6da86 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Sun, 15 Mar 2009 13:59:15 +0000
Subject: [PATCH] add clear_draw_callback, etc

---
 panda/src/display/displayRegion.I    | 22 ++++++++++++++++++++++
 panda/src/display/displayRegion.h    |  2 ++
 panda/src/pgraphnodes/callbackNode.I | 22 ++++++++++++++++++++++
 panda/src/pgraphnodes/callbackNode.h |  2 ++
 4 files changed, 48 insertions(+)

diff --git a/panda/src/display/displayRegion.I b/panda/src/display/displayRegion.I
index 87feef3ab4..72acfb3628 100644
--- a/panda/src/display/displayRegion.I
+++ b/panda/src/display/displayRegion.I
@@ -227,6 +227,17 @@ set_cull_callback(CallbackObject *object) {
   cdata->_cull_callback = object;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: DisplayRegion::clear_cull_callback
+//       Access: Published
+//  Description: Removes the callback set by an earlier call to
+//               set_cull_callback().
+////////////////////////////////////////////////////////////////////
+INLINE void DisplayRegion::
+clear_cull_callback() {
+  set_cull_callback(NULL);
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: DisplayRegion::get_cull_callback
 //       Access: Published
@@ -278,6 +289,17 @@ set_draw_callback(CallbackObject *object) {
   cdata->_draw_callback = object;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: DisplayRegion::clear_draw_callback
+//       Access: Published
+//  Description: Removes the callback set by an earlier call to
+//               set_draw_callback().
+////////////////////////////////////////////////////////////////////
+INLINE void DisplayRegion::
+clear_draw_callback() {
+  set_draw_callback(NULL);
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: DisplayRegion::get_draw_callback
 //       Access: Published
diff --git a/panda/src/display/displayRegion.h b/panda/src/display/displayRegion.h
index 09dd971971..3188d1b675 100644
--- a/panda/src/display/displayRegion.h
+++ b/panda/src/display/displayRegion.h
@@ -108,9 +108,11 @@ PUBLISHED:
   INLINE int get_cube_map_index() const;
 
   INLINE void set_cull_callback(CallbackObject *object);
+  INLINE void clear_cull_callback();
   INLINE CallbackObject *get_cull_callback() const;
 
   INLINE void set_draw_callback(CallbackObject *object);
+  INLINE void clear_draw_callback();
   INLINE CallbackObject *get_draw_callback() const;
 
   INLINE int get_pixel_width() const;
diff --git a/panda/src/pgraphnodes/callbackNode.I b/panda/src/pgraphnodes/callbackNode.I
index 3f3f589af1..6a8f8a3317 100644
--- a/panda/src/pgraphnodes/callbackNode.I
+++ b/panda/src/pgraphnodes/callbackNode.I
@@ -49,6 +49,17 @@ set_cull_callback(CallbackObject *object) {
   cdata->_cull_callback = object;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: CallbackNode::clear_cull_callback
+//       Access: Published
+//  Description: Removes the callback set by an earlier call to
+//               set_cull_callback().
+////////////////////////////////////////////////////////////////////
+INLINE void CallbackNode::
+clear_cull_callback() {
+  set_cull_callback(NULL);
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: CallbackNode::get_cull_callback
 //       Access: Published
@@ -93,6 +104,17 @@ set_draw_callback(CallbackObject *object) {
   cdata->_draw_callback = object;
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: CallbackNode::clear_draw_callback
+//       Access: Published
+//  Description: Removes the callback set by an earlier call to
+//               set_draw_callback().
+////////////////////////////////////////////////////////////////////
+INLINE void CallbackNode::
+clear_draw_callback() {
+  set_draw_callback(NULL);
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: CallbackNode::get_draw_callback
 //       Access: Published
diff --git a/panda/src/pgraphnodes/callbackNode.h b/panda/src/pgraphnodes/callbackNode.h
index 708433c044..c8720d98c2 100644
--- a/panda/src/pgraphnodes/callbackNode.h
+++ b/panda/src/pgraphnodes/callbackNode.h
@@ -30,9 +30,11 @@ PUBLISHED:
   CallbackNode(const string &name);
 
   INLINE void set_cull_callback(CallbackObject *object);
+  INLINE void clear_cull_callback();
   INLINE CallbackObject *get_cull_callback() const;
 
   INLINE void set_draw_callback(CallbackObject *object);
+  INLINE void clear_draw_callback();
   INLINE CallbackObject *get_draw_callback() const;
 
 public: