From 7d9b5d61f932cc6c1f1ed5631a713fe1e9dfcbfe Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@googlemail.com>
Date: Fri, 25 Dec 2015 16:58:18 +0100
Subject: [PATCH] Fix crash when unpacking aligned textures

---
 panda/src/glstuff/glGraphicsStateGuardian_src.cxx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
index 286db3e2f3..9645957d9d 100644
--- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
+++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
@@ -12113,6 +12113,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.