From 027a56184379e1c1a6474dcc61482fd8894490ab Mon Sep 17 00:00:00 2001 From: tobspr Date: Sun, 8 Nov 2015 11:56:43 +0100 Subject: [PATCH 1/2] Fix color write mask in OpenGL --- panda/src/glstuff/glGraphicsStateGuardian_src.I | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.I b/panda/src/glstuff/glGraphicsStateGuardian_src.I index d973269700..b1f4abef06 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.I +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.I @@ -624,10 +624,10 @@ INLINE void CLP(GraphicsStateGuardian):: set_color_write_mask(int mask) { if (gl_color_mask && _active_color_write_mask != mask) { _active_color_write_mask = mask; - glColorMask((_color_write_mask & ColorWriteAttrib::C_red) != 0, - (_color_write_mask & ColorWriteAttrib::C_green) != 0, - (_color_write_mask & ColorWriteAttrib::C_blue) != 0, - (_color_write_mask & ColorWriteAttrib::C_alpha) != 0); + glColorMask((mask & ColorWriteAttrib::C_red) != 0, + (mask & ColorWriteAttrib::C_green) != 0, + (mask & ColorWriteAttrib::C_blue) != 0, + (mask & ColorWriteAttrib::C_alpha) != 0); } } From ba3a2c1e3879965cd9e865f5da0210ca8b6fa36f Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 9 Nov 2015 02:26:02 +0100 Subject: [PATCH 2/2] Fix saveCubeMap and saveSphereMap in multithreaded pipeline --- direct/src/showbase/ShowBase.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py index 54e18040b3..fb1fdd2b78 100644 --- a/direct/src/showbase/ShowBase.py +++ b/direct/src/showbase/ShowBase.py @@ -2517,6 +2517,8 @@ class ShowBase(DirectObject.DirectObject): rig.reparentTo(camera) base.graphicsEngine.openWindows() base.graphicsEngine.renderFrame() + self.graphicsEngine.renderFrame() + self.graphicsEngine.syncFrame() tex = buffer.getTexture() saved = self.screenshot(namePrefix = namePrefix, @@ -2607,6 +2609,7 @@ class ShowBase(DirectObject.DirectObject): # One more frame for luck. base.graphicsEngine.renderFrame() + self.graphicsEngine.syncFrame() saved = self.screenshot(namePrefix = namePrefix, defaultFilename = defaultFilename,