Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-28 21:50:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

PR comments

Browse source
This commit is contained in:
Brad Davis 2016-04-21 14:11:01 -07:00
parent ef466a64bf
commit 33ec73bfd8
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/gpu/src/gpu/GLBackendTexture.cpp
View file

@ -160,7 +160,9 @@ GLBackend::GLTexture::~GLTexture() {
if (_transferrable) { if (_transferrable) {
uint16 mipCount = usedMipLevels(); uint16 mipCount = usedMipLevels();
Q_ASSERT(_textureCountByMips.count(mipCount)); Q_ASSERT(_textureCountByMips.count(mipCount));
if (0 == --_textureCountByMips[mipCount]) { auto& numTexturesForMipCount = _textureCountByMips[mipCount];
--numTexturesForMipCount;
if (0 == numTexturesForMipCount) {
_textureCountByMips.erase(mipCount); _textureCountByMips.erase(mipCount);
if (mipCount == _currentMaxMipCount) { if (mipCount == _currentMaxMipCount) {
_currentMaxMipCount = _textureCountByMips.rbegin()->first; _currentMaxMipCount = _textureCountByMips.rbegin()->first;

2
libraries/ui/src/VrMenu.cpp
View file

@ -236,5 +236,5 @@ void VrMenu::removeAction(QAction* action) {
QQuickMenuBase* qmlItem = reinterpret_cast<QQuickMenuBase*>(item); QQuickMenuBase* qmlItem = reinterpret_cast<QQuickMenuBase*>(item);
bool invokeResult = QMetaObject::invokeMethod(menu, "removeItem", Qt::DirectConnection, bool invokeResult = QMetaObject::invokeMethod(menu, "removeItem", Qt::DirectConnection,
Q_ARG(QQuickMenuBase*, qmlItem)); Q_ARG(QQuickMenuBase*, qmlItem));
//Q_ASSERT(invokeResult); Q_ASSERT(invokeResult);
} }