diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx index 889e2b5e86..a55a03561c 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx @@ -12824,6 +12824,10 @@ extract_texture_image(PTA_uchar &image, size_t &page_size, return false; #else + // Make sure the GL driver does not align textures, otherwise we get corrupt + // memory, since we don't take alignment into account. + glPixelStorei(GL_PACK_ALIGNMENT, 1); + if (target == GL_TEXTURE_CUBE_MAP) { // A cube map, compressed or uncompressed. This we must extract // one page at a time. diff --git a/panda/src/particlesystem/particleSystem.cxx b/panda/src/particlesystem/particleSystem.cxx index c44fd5c0f6..112b27159c 100644 --- a/panda/src/particlesystem/particleSystem.cxx +++ b/panda/src/particlesystem/particleSystem.cxx @@ -249,7 +249,7 @@ spawn_child_system(BaseParticle *bp) { if (_spawn_templates.size() == 0) { physics_cat.error() << "ParticleSystem::spawn_child_system: " - << "no spawn templates presesnt." << endl; + << "no spawn templates present." << endl; return; }