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

fixes for compiling with GSG_VERBOSE defined

This commit is contained in:
David Rose 2001-07-03 03:50:33 +00:00
parent ada5f55002
commit 34b0804fd4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/glgsg/glGraphicsStateGuardian.cxx
View File

@ -3807,7 +3807,7 @@ apply_texture_immediate(Texture *tex) {
int wanted_size =
compute_gl_image_size(pb->get_xsize(), pb->get_ysize(),
external_format, type);
nassertr(wanted_size == pb->_image.size(), false);
nassertr(wanted_size == (int)pb->_image.size(), false);
#endif // NDEBUG
set_unpack_alignment(1);
@ -4444,7 +4444,7 @@ save_mipmap_images(Texture *tex) {
Filename filename = tex->get_name();
string name;
if (filename.empty()) {
static index = 0;
static int index = 0;
name = "texture" + format_string(index);
index++;
} else {
@ -4535,7 +4535,6 @@ dump_state(void)
{
dump << "\t\t\t\t" << "GL_LIGHT" << i << " " << _light_info[i]._enabled << " " << (bool)glIsEnabled(GL_LIGHT0+i) << "\n";
}
dump << "\t\t" << "GL_COLOR_MATERIAL " << _color_material_enabled << " " << (bool)glIsEnabled(GL_COLOR_MATERIAL) << "\n";
dump << "\t\t" << "GL_SCISSOR_TEST " << _scissor_enabled << " " << (bool)glIsEnabled(GL_SCISSOR_TEST) << "\n";
dump << "\t\t" << "GL_TEXTURE_2D " << _texturing_enabled << " " << (bool)glIsEnabled(GL_TEXTURE_2D) << "\n";
dump << "\t\t" << "GL_DITHER " << _dither_enabled << " " << (bool)glIsEnabled(GL_DITHER) << "\n";