From 8b7d1416660012380e0861218e2dfcfcb04716f6 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 1 Jun 2005 00:39:31 +0000
Subject: [PATCH] move get_gsg() to StandardMunger

---
 panda/src/display/standardMunger.I   | 11 +++++++++++
 panda/src/display/standardMunger.cxx |  2 +-
 panda/src/display/standardMunger.h   |  6 ++++--
 panda/src/glstuff/glGeomMunger_src.I | 12 ------------
 panda/src/glstuff/glGeomMunger_src.h |  2 --
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/panda/src/display/standardMunger.I b/panda/src/display/standardMunger.I
index 54853325eb..1a74e83b8b 100644
--- a/panda/src/display/standardMunger.I
+++ b/panda/src/display/standardMunger.I
@@ -16,3 +16,14 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+
+////////////////////////////////////////////////////////////////////
+//     Function: StandardMunger::get_gsg
+//       Access: Public
+//  Description: Returns a pointer to the GSG that created this
+//               munger.
+////////////////////////////////////////////////////////////////////
+INLINE GraphicsStateGuardian *StandardMunger::
+get_gsg() const {
+  return _gsg;
+}
diff --git a/panda/src/display/standardMunger.cxx b/panda/src/display/standardMunger.cxx
index c741a33adb..80d378031f 100644
--- a/panda/src/display/standardMunger.cxx
+++ b/panda/src/display/standardMunger.cxx
@@ -33,7 +33,7 @@ TypeHandle StandardMunger::_type_handle;
 //               we might as well convert it as we munge).
 ////////////////////////////////////////////////////////////////////
 StandardMunger::
-StandardMunger(const GraphicsStateGuardianBase *gsg, const RenderState *state,
+StandardMunger(GraphicsStateGuardianBase *gsg, const RenderState *state,
                int num_components,
                StandardMunger::NumericType numeric_type,
                StandardMunger::Contents contents) :
diff --git a/panda/src/display/standardMunger.h b/panda/src/display/standardMunger.h
index bbb3f55081..c13b1a5c0d 100644
--- a/panda/src/display/standardMunger.h
+++ b/panda/src/display/standardMunger.h
@@ -38,11 +38,13 @@
 ////////////////////////////////////////////////////////////////////
 class EXPCL_PANDA StandardMunger : public StateMunger {
 public:
-  StandardMunger(const GraphicsStateGuardianBase *gsg, const RenderState *state,
+  StandardMunger(GraphicsStateGuardianBase *gsg, const RenderState *state,
                  int num_components, NumericType numeric_type,
                  Contents contents);
   virtual ~StandardMunger();
 
+  INLINE GraphicsStateGuardian *get_gsg() const;
+
 protected:
   virtual CPT(qpGeomVertexData) munge_data_impl(const qpGeomVertexData *data);
   virtual int compare_to_impl(const qpGeomMunger *other) const;
@@ -54,7 +56,7 @@ private:
   int _num_components;
   NumericType _numeric_type;
   Contents _contents;
-  CPT(GraphicsStateGuardian) _gsg;
+  PT(GraphicsStateGuardian) _gsg;
   CPT(RenderModeAttrib) _render_mode;
 
   bool _munge_color;
diff --git a/panda/src/glstuff/glGeomMunger_src.I b/panda/src/glstuff/glGeomMunger_src.I
index 63d0f6629f..e98b75c0bc 100644
--- a/panda/src/glstuff/glGeomMunger_src.I
+++ b/panda/src/glstuff/glGeomMunger_src.I
@@ -25,23 +25,11 @@
 INLINE CLP(GeomMunger)::
 CLP(GeomMunger)(GraphicsStateGuardian *gsg, const RenderState *state) :
   StandardMunger(gsg, state, 4, NT_uint8, C_color),
-  _gsg(gsg),
   _texture(state->get_texture()),
   _tex_gen(state->get_tex_gen())
 {
 }
 
-////////////////////////////////////////////////////////////////////
-//     Function: CLP(GeomMunger)::get_gsg
-//       Access: Public
-//  Description: Returns a pointer to the GSG that created this
-//               munger.
-////////////////////////////////////////////////////////////////////
-INLINE GraphicsStateGuardian *CLP(GeomMunger)::
-get_gsg() const {
-  return _gsg;
-}
-
 ////////////////////////////////////////////////////////////////////
 //     Function: CLP(GeomMunger)::operator new
 //       Access: Public
diff --git a/panda/src/glstuff/glGeomMunger_src.h b/panda/src/glstuff/glGeomMunger_src.h
index 3073aacfa2..a334ae1bdb 100644
--- a/panda/src/glstuff/glGeomMunger_src.h
+++ b/panda/src/glstuff/glGeomMunger_src.h
@@ -36,8 +36,6 @@ public:
   INLINE CLP(GeomMunger)(GraphicsStateGuardian *gsg, const RenderState *state);
   virtual ~CLP(GeomMunger)();
 
-  INLINE GraphicsStateGuardian *get_gsg() const;
-
 protected:
   virtual CPT(qpGeomVertexFormat) munge_format_impl(const qpGeomVertexFormat *orig,
                                                     const qpGeomVertexAnimationSpec &animation);