diff --git a/panda/src/egg/eggAttributes.I b/panda/src/egg/eggAttributes.I index a63fe5bbb3..b626f73096 100644 --- a/panda/src/egg/eggAttributes.I +++ b/panda/src/egg/eggAttributes.I @@ -6,26 +6,6 @@ #include -//////////////////////////////////////////////////////////////////// -// Function: EggAttributes::Constructor -// Access: Public -// Description: -//////////////////////////////////////////////////////////////////// -INLINE EggAttributes:: -EggAttributes() { - _flags = 0; -} - -//////////////////////////////////////////////////////////////////// -// Function: EggAttributes::Copy constructor -// Access: Public -// Description: -//////////////////////////////////////////////////////////////////// -INLINE EggAttributes:: -EggAttributes(const EggAttributes ©) { - (*this) = copy; -} - //////////////////////////////////////////////////////////////////// // Function: EggAttributes::has_normal // Access: Public diff --git a/panda/src/egg/eggAttributes.cxx b/panda/src/egg/eggAttributes.cxx index 95f574222d..8a96397fc9 100644 --- a/panda/src/egg/eggAttributes.cxx +++ b/panda/src/egg/eggAttributes.cxx @@ -14,6 +14,26 @@ TypeHandle EggAttributes::_type_handle; +//////////////////////////////////////////////////////////////////// +// Function: EggAttributes::Constructor +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +EggAttributes:: +EggAttributes() { + _flags = 0; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggAttributes::Copy constructor +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +EggAttributes:: +EggAttributes(const EggAttributes ©) { + (*this) = copy; +} + //////////////////////////////////////////////////////////////////// // Function: EggAttributes::Copy assignment operator // Access: Public @@ -31,6 +51,15 @@ operator = (const EggAttributes ©) { return *this; } +//////////////////////////////////////////////////////////////////// +// Function: EggAttributes::Destructor +// Access: Public, Virtual +// Description: +//////////////////////////////////////////////////////////////////// +EggAttributes:: +~EggAttributes() { +} + //////////////////////////////////////////////////////////////////// // Function: EggAttributes::write diff --git a/panda/src/egg/eggAttributes.h b/panda/src/egg/eggAttributes.h index 498ac684e2..ddf0cee81d 100644 --- a/panda/src/egg/eggAttributes.h +++ b/panda/src/egg/eggAttributes.h @@ -26,9 +26,10 @@ //////////////////////////////////////////////////////////////////// class EXPCL_PANDAEGG EggAttributes { public: - INLINE EggAttributes(); - INLINE EggAttributes(const EggAttributes ©); + EggAttributes(); + EggAttributes(const EggAttributes ©); EggAttributes &operator = (const EggAttributes ©); + virtual ~EggAttributes(); INLINE bool has_normal() const; INLINE const Normald &get_normal() const; diff --git a/panda/src/egg/eggVertex.cxx b/panda/src/egg/eggVertex.cxx index 32c96f6ec2..a4b4a2d321 100644 --- a/panda/src/egg/eggVertex.cxx +++ b/panda/src/egg/eggVertex.cxx @@ -77,7 +77,7 @@ operator = (const EggVertex ©) { //////////////////////////////////////////////////////////////////// // Function: EggVertex::Destructor -// Access: Public +// Access: Public, Virtual // Description: //////////////////////////////////////////////////////////////////// EggVertex:: diff --git a/panda/src/egg/eggVertex.h b/panda/src/egg/eggVertex.h index b251c32913..ef7482effc 100644 --- a/panda/src/egg/eggVertex.h +++ b/panda/src/egg/eggVertex.h @@ -34,7 +34,7 @@ public: EggVertex(); EggVertex(const EggVertex ©); EggVertex &operator = (const EggVertex ©); - ~EggVertex(); + virtual ~EggVertex(); INLINE EggVertexPool *get_pool() const;