TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.9.x'

Browse Source
This commit is contained in:
rdb 2015-11-03 20:30:33 +01:00
commit 1adb0e48f4
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makepanda/makepanda.py
View File

@ -1237,6 +1237,10 @@ def CompileCxx(obj,src,opts):
else: else:
cmd += " -fno-exceptions" cmd += " -fno-exceptions"
if src.endswith(".mm"):
# Work around Apple compiler bug.
cmd += " -U__EXCEPTIONS"
if 'RTTI' not in opts: if 'RTTI' not in opts:
# We always disable RTTI on Android for memory usage reasons. # We always disable RTTI on Android for memory usage reasons.
if optlevel >= 4 or GetTarget() == "android": if optlevel >= 4 or GetTarget() == "android":

9
panda/src/glstuff/glGraphicsBuffer_src.cxx
View File

@ -1626,6 +1626,15 @@ report_my_errors(int line, const char *file) {
void CLP(GraphicsBuffer):: void CLP(GraphicsBuffer)::
check_host_valid() { check_host_valid() {
if ((_host == 0)||(!_host->is_valid())) { if ((_host == 0)||(!_host->is_valid())) {
_rb_data_size_bytes = 0;
if (_rb_context != NULL) {
// We must delete this object first, because when the GSG
// destructs, so will the tracker that this context is
// attached to.
_rb_context->update_data_size_bytes(0);
delete _rb_context;
_rb_context = NULL;
}
_is_valid = false; _is_valid = false;
_gsg.clear(); _gsg.clear();
_host.clear(); _host.clear();