RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.9.x' 

Conflicts:
	direct/src/showbase/ShowBase.py
This commit is contained in:
rdb 2015-11-09 02:29:41 +01:00
parent 11437c5afd ba3a2c1e38
commit 4a5d64909a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
direct/src/showbase/ShowBase.py
View File

@ -2512,6 +2512,8 @@ class ShowBase(DirectObject.DirectObject):
rig.reparentTo(camera)
self.graphicsEngine.openWindows()
self.graphicsEngine.renderFrame()
self.graphicsEngine.renderFrame()
self.graphicsEngine.syncFrame()
tex = buffer.getTexture()
saved = self.screenshot(namePrefix = namePrefix,
@ -2602,6 +2604,7 @@ class ShowBase(DirectObject.DirectObject):
# One more frame for luck.
self.graphicsEngine.renderFrame()
self.graphicsEngine.syncFrame()
saved = self.screenshot(namePrefix = namePrefix,
defaultFilename = defaultFilename,

8
panda/src/glstuff/glGraphicsStateGuardian_src.I
View File

@ -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);
}
}