diff --git a/panda/src/display/graphicsStateGuardian.I b/panda/src/display/graphicsStateGuardian.I index e490e01e6d..7db28d017d 100644 --- a/panda/src/display/graphicsStateGuardian.I +++ b/panda/src/display/graphicsStateGuardian.I @@ -277,7 +277,7 @@ get_coordinate_system() const { //////////////////////////////////////////////////////////////////// template INLINE bool -get_attribute_into(Transition *&ptr, GraphicsStateGuardian *gsg) { +get_attribute_into(Transition *&ptr, const GraphicsStateGuardian *gsg) { NodeTransition *nt = gsg->get_attribute(Transition::get_class_type()); if (nt == (NodeTransition *)NULL) { ptr = (Transition *)NULL; diff --git a/panda/src/display/graphicsStateGuardian.h b/panda/src/display/graphicsStateGuardian.h index 99106659f5..ed4f1c8bb6 100644 --- a/panda/src/display/graphicsStateGuardian.h +++ b/panda/src/display/graphicsStateGuardian.h @@ -326,7 +326,7 @@ private: template INLINE bool -get_attribute_into(Transition *&ptr, GraphicsStateGuardian *gsg); +get_attribute_into(Transition *&ptr, const GraphicsStateGuardian *gsg); #include "graphicsStateGuardian.I" diff --git a/panda/src/dxgsg/dxGraphicsStateGuardian.cxx b/panda/src/dxgsg/dxGraphicsStateGuardian.cxx index 8ac1bbb909..7573b85344 100644 --- a/panda/src/dxgsg/dxGraphicsStateGuardian.cxx +++ b/panda/src/dxgsg/dxGraphicsStateGuardian.cxx @@ -1835,7 +1835,7 @@ draw_sprite(GeomSprite *geom, GeomContext *gc) { LMatrix4f modelview_mat; const TransformTransition *ctatt; - if (!get_attribute_into(ctatt, this)) { + if (!get_attribute_into(ctatt, this)) modelview_mat = LMatrix4f::ident_mat(); else modelview_mat = ctatt->get_matrix();