RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor windows porting probs

This commit is contained in:
David Rose 2001-08-09 19:38:59 +00:00
parent d78b81f540
commit 7c7300ff74
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/display/graphicsStateGuardian.I
View File

@ -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;

2
panda/src/display/graphicsStateGuardian.h
View File

@ -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"

2
panda/src/dxgsg/dxGraphicsStateGuardian.cxx
View File

@ -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();