Fixed bug with stencil in deeply nested containers

- Fixed bug with stencil in deeply nested containers
- Changed version numbers for bugfix release 1.6.1a1

Author: not-na

peng3d/gui/container.py

@@ -102,29 +102,29 @@ def draw(self):
         
         Note that this leaves the OpenGL state set to 2d drawing and may modify the stencil settings and buffer.
         """
-        
-        # Stencil setup
-        glEnable(GL_STENCIL_TEST)
-        #mask = pyglet.image.get_buffer_manager().get_buffer_mask()
-        #glSetAttribute(GL_STENCIL_SIZE,8)
-        
-        # Set up the stencil for this container
-        glStencilFunc(GL_ALWAYS,1,0xFF)
-        glStencilOp(GL_KEEP,GL_KEEP,GL_REPLACE)
-        glStencilMask(0xFF)
-        glClear(GL_STENCIL_BUFFER_BIT)
-        
-        # Practically hides most drawing operations, should be redundant since the quad is fully transparent
-        glColorMask(GL_FALSE,GL_FALSE,GL_FALSE,GL_FALSE)
-        glDepthMask(GL_FALSE)
-        
-        self.stencil_vlist.draw(GL_QUADS)
-        
-        # Reset to proper state and set up the stencil func/mask
-        glStencilFunc(GL_EQUAL,1,0xFF)
-        glStencilMask(0x00)
-        glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_TRUE)
-        glDepthMask(GL_TRUE)
+        if not isinstance(self.submenu,Container):
+            # Stencil setup
+            glEnable(GL_STENCIL_TEST)
+            #mask = pyglet.image.get_buffer_manager().get_buffer_mask()
+            #glSetAttribute(GL_STENCIL_SIZE,8)
+            
+            # Set up the stencil for this container
+            glStencilFunc(GL_ALWAYS,1,0xFF)
+            glStencilOp(GL_KEEP,GL_KEEP,GL_REPLACE)
+            glStencilMask(0xFF)
+            glClear(GL_STENCIL_BUFFER_BIT)
+            
+            # Practically hides most drawing operations, should be redundant since the quad is fully transparent
+            glColorMask(GL_FALSE,GL_FALSE,GL_FALSE,GL_FALSE)
+            glDepthMask(GL_FALSE)
+            
+            self.stencil_vlist.draw(GL_QUADS)
+            
+            # Reset to proper state and set up the stencil func/mask
+            glStencilFunc(GL_EQUAL,1,0xFF)
+            glStencilMask(0x00)
+            glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_TRUE)
+            glDepthMask(GL_TRUE)
 
         # Stenciled code
         self.window.set2d()
@@ -141,16 +141,18 @@ def draw(self):
         else:
             raise TypeError("Unknown background type")
         self.window.set2d() # In case the bg layer was in 3d
-        glStencilFunc(GL_EQUAL,1,0xFF)
-        glStencilMask(0x00)
+        if not isinstance(self.submenu,Container):
+            glStencilFunc(GL_EQUAL,1,0xFF)
+            glStencilMask(0x00)
         self.batch2d.draw()
         for widget in self.widgets.values():
             widget.draw()
 
-        # Stencil teardown
-        glDisable(GL_STENCIL_TEST)
-        # Make sure to disable the stencil test first, or the stencil buffer will only clear areas that are allowed to by glStencilFunc
-        glClear(GL_STENCIL_BUFFER_BIT)
+        if not isinstance(self.submenu,Container):
+            # Stencil teardown
+            glDisable(GL_STENCIL_TEST)
+            # Make sure to disable the stencil test first, or the stencil buffer will only clear areas that are allowed to by glStencilFunc
+            glClear(GL_STENCIL_BUFFER_BIT)
 
     def redraw(self):
         """

peng3d/version.py

@@ -24,7 +24,7 @@
 
 __all__ = ["VERSION","RELEASE"]
 
-VERSION = "1.6.0a1"
+VERSION = "1.6.1a1"
 """
 Full version number of format ``MAJOR.MINOR.BUGFIX(a|b|pre)SUBRELEASE`` where major is increased only on very major feature changes.
 Minor is changed if a new feature is introduced or an API change is made, while bugfix only changes if an important fix for a bug needs to be provided before the next release.
@@ -38,7 +38,7 @@
 
 """
 
-RELEASE = "1.6.0"
+RELEASE = "1.6.1"
 """
 Same as :py:data:`VERSION` but without the subrelease.