From 33ec73bfd8a0520b2d465893aa6e31a88e4ac72d Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 21 Apr 2016 14:11:01 -0700 Subject: [PATCH] PR comments --- libraries/gpu/src/gpu/GLBackendTexture.cpp | 4 +++- libraries/ui/src/VrMenu.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/gpu/src/gpu/GLBackendTexture.cpp b/libraries/gpu/src/gpu/GLBackendTexture.cpp index e3152b1fdd..363e4a8f38 100755 --- a/libraries/gpu/src/gpu/GLBackendTexture.cpp +++ b/libraries/gpu/src/gpu/GLBackendTexture.cpp @@ -160,7 +160,9 @@ GLBackend::GLTexture::~GLTexture() { if (_transferrable) { uint16 mipCount = usedMipLevels(); Q_ASSERT(_textureCountByMips.count(mipCount)); - if (0 == --_textureCountByMips[mipCount]) { + auto& numTexturesForMipCount = _textureCountByMips[mipCount]; + --numTexturesForMipCount; + if (0 == numTexturesForMipCount) { _textureCountByMips.erase(mipCount); if (mipCount == _currentMaxMipCount) { _currentMaxMipCount = _textureCountByMips.rbegin()->first; diff --git a/libraries/ui/src/VrMenu.cpp b/libraries/ui/src/VrMenu.cpp index 2a3bf5bca8..2d6113ad63 100644 --- a/libraries/ui/src/VrMenu.cpp +++ b/libraries/ui/src/VrMenu.cpp @@ -236,5 +236,5 @@ void VrMenu::removeAction(QAction* action) { QQuickMenuBase* qmlItem = reinterpret_cast(item); bool invokeResult = QMetaObject::invokeMethod(menu, "removeItem", Qt::DirectConnection, Q_ARG(QQuickMenuBase*, qmlItem)); - //Q_ASSERT(invokeResult); + Q_ASSERT(invokeResult); }