From 3e6e355577740e120f51df6e4fa56d19bfb0d07c Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 10 Aug 2015 04:34:45 +0200 Subject: [PATCH 1/2] Fix error building rocket package on 1.9 branch --- direct/src/showutil/FreezeTool.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/direct/src/showutil/FreezeTool.py b/direct/src/showutil/FreezeTool.py index 68a6eff60a..54f7c90429 100644 --- a/direct/src/showutil/FreezeTool.py +++ b/direct/src/showutil/FreezeTool.py @@ -978,11 +978,10 @@ class Freezer: stuff = ("", "rb", imp.PY_COMPILED) self.mf.load_module(mdef.moduleName, fp, pathname, stuff) else: - fp = open(pathname, 'U') if mdef.text: fp = StringIO(mdef.text) else: - fp = open(pathname, modulefinder.READ_MODE) + fp = open(pathname, 'U') stuff = ("", "r", imp.PY_SOURCE) self.mf.load_module(mdef.moduleName, fp, pathname, stuff) From 888efc18afcdabe1855cb06522ed2232dfe0c211 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 11 Aug 2015 13:56:47 +0200 Subject: [PATCH 2/2] Avoid unnecessary glVertexAttribDivisor calls --- panda/src/glstuff/glShaderContext_src.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/src/glstuff/glShaderContext_src.cxx b/panda/src/glstuff/glShaderContext_src.cxx index 2a67e0ba21..5df6c93871 100644 --- a/panda/src/glstuff/glShaderContext_src.cxx +++ b/panda/src/glstuff/glShaderContext_src.cxx @@ -1425,7 +1425,7 @@ update_shader_vertex_arrays(ShaderContext *prev, bool force) { GL_TRUE, stride, client_pointer); } - if (_glgsg->_supports_vertex_attrib_divisor) { + if (_glgsg->_supports_vertex_attrib_divisor && divisor > 0) { _glgsg->_glVertexAttribDivisor(p, divisor); _has_divisor = true; }