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

minor track-memory-usage bugs

Browse Source
This commit is contained in:
David Rose 2004-09-30 17:06:05 +00:00
parent 00bdfb7118
commit 7d829390e7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/express/memoryInfo.cxx
View File

@ -108,6 +108,8 @@ determine_dynamic_type() {
<< " and make sure that all are being initialized.\n"; << " and make sure that all are being initialized.\n";
_dynamic_type = _static_type; _dynamic_type = _static_type;
_flags &= ~F_reconsider_dynamic_type; _flags &= ~F_reconsider_dynamic_type;
nassert_raise("Unregistered type.");
return; return;
} }

6
panda/src/express/memoryUsage.cxx
View File

@ -377,9 +377,11 @@ MemoryUsage() {
// count-memory-usage is a much lighter-weight version, and only // count-memory-usage is a much lighter-weight version, and only
// tracks the total memory allocation. However, it only works for // tracks the total memory allocation. However, it only works for
// certain build environments. // certain build environments (in particular, only in an Opt1 or
// Opt2 build on Windows).
#if defined(WIN32_VC) && defined(_DEBUG) #if defined(WIN32_VC) && defined(_DEBUG)
_count_memory_usage = config_express.GetBool("count-memory-usage", false); _count_memory_usage = config_express.GetBool("count-memory-usage",
_track_memory_usage);
#else #else
_count_memory_usage = false; _count_memory_usage = false;
#endif #endif