Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:17:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9270 from sethalves/fix-up-vhacd-cl-util

Browse source 
fix a crash and a memory leak in vhacd-util
This commit is contained in:
Brad Hefta-Gaub 2016-12-24 14:52:12 -08:00 committed by GitHub
commit 03c053b7e9
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/shared/src/Trace.h
View file

@ -101,7 +101,10 @@ private:
}; };
inline void traceEvent(const QLoggingCategory& category, const QString& name, EventType type, const QString& id = "", const QVariantMap& args = {}, const QVariantMap& extra = {}) { inline void traceEvent(const QLoggingCategory& category, const QString& name, EventType type, const QString& id = "", const QVariantMap& args = {}, const QVariantMap& extra = {}) {
DependencyManager::get<Tracer>()->traceEvent(category, name, type, id, args, extra); const auto& tracer = DependencyManager::get<Tracer>();
if (tracer) {
tracer->traceEvent(category, name, type, id, args, extra);
}
} }
inline void traceEvent(const QLoggingCategory& category, const QString& name, EventType type, int id, const QVariantMap& args = {}, const QVariantMap& extra = {}) { inline void traceEvent(const QLoggingCategory& category, const QString& name, EventType type, int id, const QVariantMap& args = {}, const QVariantMap& extra = {}) {

1
tools/vhacd-util/src/VHACDUtil.cpp
View file

@ -51,6 +51,7 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
return false; return false;
} }
result = *geom; result = *geom;
delete geom;
reSortFBXGeometryMeshes(result); reSortFBXGeometryMeshes(result);
} catch (const QString& error) { } catch (const QString& error) {