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

store non-const InternalNames

This commit is contained in:
David Rose 2005-09-25 15:21:08 +00:00
parent 89ba79e0ba
commit 3813de7e91
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/gobj/textureStage.I
View File

@ -136,7 +136,7 @@ operator < (const TextureStage &other) const {
// sets, each of which must have a unique name.
////////////////////////////////////////////////////////////////////
INLINE void TextureStage::
set_texcoord_name(const InternalName *name) {
set_texcoord_name(InternalName *name) {
_texcoord_name = name;
}
@ -157,7 +157,7 @@ set_texcoord_name(const string &name) {
// Access: Published
// Description: Returns the InternalName
////////////////////////////////////////////////////////////////////
INLINE const InternalName *TextureStage::
INLINE InternalName *TextureStage::
get_texcoord_name() const {
return _texcoord_name;
}

6
panda/src/gobj/textureStage.h
View File

@ -101,9 +101,9 @@ PUBLISHED:
INLINE bool operator < (const TextureStage &other) const;
INLINE void set_texcoord_name(const InternalName *name);
INLINE void set_texcoord_name(InternalName *name);
INLINE void set_texcoord_name(const string &texcoord_name);
INLINE const InternalName *get_texcoord_name() const;
INLINE InternalName *get_texcoord_name() const;
INLINE void set_mode(Mode mode);
INLINE Mode get_mode() const;
@ -177,7 +177,7 @@ private:
string _name;
int _sort;
int _priority;
CPT(InternalName) _texcoord_name;
PT(InternalName) _texcoord_name;
Mode _mode;
Colorf _color;
int _rgb_scale;