diff --git a/panda/src/dxgsg8/dxGeomMunger8.I b/panda/src/dxgsg8/dxGeomMunger8.I index 0c1a63f6ca..88de8dd080 100644 --- a/panda/src/dxgsg8/dxGeomMunger8.I +++ b/panda/src/dxgsg8/dxGeomMunger8.I @@ -24,6 +24,6 @@ //////////////////////////////////////////////////////////////////// INLINE DXGeomMunger8:: DXGeomMunger8(GraphicsStateGuardian *gsg, const RenderState *state) : - qpGeomMunger(gsg, state) + ColorMunger(gsg, state, 1, qpGeomVertexDataType::NT_packed_argb) { } diff --git a/panda/src/dxgsg8/dxGeomMunger8.cxx b/panda/src/dxgsg8/dxGeomMunger8.cxx index 5197f68e55..151b44035c 100644 --- a/panda/src/dxgsg8/dxGeomMunger8.cxx +++ b/panda/src/dxgsg8/dxGeomMunger8.cxx @@ -94,5 +94,5 @@ int DXGeomMunger8:: compare_to_impl(const qpGeomMunger *other) const { // const DXGeomMunger8 *om = DCAST(DXGeomMunger8, other); - return 0; + return ColorMunger::compare_to_impl(other); } diff --git a/panda/src/dxgsg8/dxGeomMunger8.h b/panda/src/dxgsg8/dxGeomMunger8.h index 267bcc7298..c0c4dd4634 100644 --- a/panda/src/dxgsg8/dxGeomMunger8.h +++ b/panda/src/dxgsg8/dxGeomMunger8.h @@ -20,7 +20,7 @@ #define DXGEOMMUNGER8_H #include "pandabase.h" -#include "qpgeomMunger.h" +#include "colorMunger.h" #include "graphicsStateGuardian.h" //////////////////////////////////////////////////////////////////// @@ -31,7 +31,7 @@ // and that all relevant components are packed into a // single array, in the correct order. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDADX DXGeomMunger8 : public qpGeomMunger { +class EXPCL_PANDADX DXGeomMunger8 : public ColorMunger { public: INLINE DXGeomMunger8(GraphicsStateGuardian *gsg, const RenderState *state); @@ -45,9 +45,9 @@ public: return _type_handle; } static void init_type() { - qpGeomMunger::init_type(); + ColorMunger::init_type(); register_type(_type_handle, "DXGeomMunger8", - qpGeomMunger::get_class_type()); + ColorMunger::get_class_type()); } virtual TypeHandle get_type() const { return get_class_type();