From 5ea3c0c47c277541e200fcfc3e4836ca22b1c7af Mon Sep 17 00:00:00 2001
From: Zachary Pavlov <zachary.pavlov@gmail.com>
Date: Tue, 29 Apr 2008 18:59:47 +0000
Subject: [PATCH] made combine_with published

---
 panda/src/pgraph/pandaNode.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/panda/src/pgraph/pandaNode.h b/panda/src/pgraph/pandaNode.h
index 17395300a7..ed86d1091a 100644
--- a/panda/src/pgraph/pandaNode.h
+++ b/panda/src/pgraph/pandaNode.h
@@ -77,6 +77,8 @@ class EXPCL_PANDA_PGRAPH PandaNode : public TypedWritable, public Namable,
 PUBLISHED:
   PandaNode(const string &name);
   virtual ~PandaNode();
+  //published so that characters can be combined. 
+  virtual PandaNode *combine_with(PandaNode *other); 
 
 protected:
   PandaNode(const PandaNode &copy);
@@ -99,7 +101,7 @@ public:
                                          int attrib_types,
                                          GeomTransformer &transformer);
   virtual void xform(const LMatrix4f &mat);
-  virtual PandaNode *combine_with(PandaNode *other); 
+
   virtual CPT(TransformState)
     calc_tight_bounds(LPoint3f &min_point, LPoint3f &max_point,
                       bool &found_any,