Browse Source

minor windows porting probs

David Rose 24 years ago
parent
commit
7c7300ff74

+ 1 - 1
panda/src/display/graphicsStateGuardian.I

@@ -277,7 +277,7 @@ get_coordinate_system() const {
 ////////////////////////////////////////////////////////////////////
 template<class Transition>
 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;

+ 1 - 1
panda/src/display/graphicsStateGuardian.h

@@ -326,7 +326,7 @@ private:
 
 template<class Transition>
 INLINE bool
-get_attribute_into(Transition *&ptr, GraphicsStateGuardian *gsg);
+get_attribute_into(Transition *&ptr, const GraphicsStateGuardian *gsg);
 
 #include "graphicsStateGuardian.I"
 

+ 1 - 1
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();