TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.9.x'

Browse Source
This commit is contained in:
rdb 2015-12-25 17:02:56 +01:00
commit f12e2b5f68
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -12824,6 +12824,10 @@ extract_texture_image(PTA_uchar &image, size_t &page_size,
return false; return false;
#else #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) { if (target == GL_TEXTURE_CUBE_MAP) {
// A cube map, compressed or uncompressed. This we must extract // A cube map, compressed or uncompressed. This we must extract
// one page at a time. // one page at a time.

2
panda/src/particlesystem/particleSystem.cxx
View File

@ -249,7 +249,7 @@ spawn_child_system(BaseParticle *bp) {
if (_spawn_templates.size() == 0) { if (_spawn_templates.size() == 0) {
physics_cat.error() << "ParticleSystem::spawn_child_system: " physics_cat.error() << "ParticleSystem::spawn_child_system: "
<< "no spawn templates presesnt." << endl; << "no spawn templates present." << endl;
return; return;
} }