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

fix bad conflict resolution

Browse source
This commit is contained in:
Andrew Meadows 2017-11-08 17:16:13 -08:00
parent e93c10b5ee
commit 111480f630
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/entities-renderer/src/RenderableEntityItem.h
View file

@ -119,7 +119,6 @@ protected:
QUuid _changeHandlerId; QUuid _changeHandlerId;
ItemID _renderItemID{ Item::INVALID_ITEM_ID }; ItemID _renderItemID{ Item::INVALID_ITEM_ID };
ItemIDs _subRenderItemIDs; ItemIDs _subRenderItemIDs;
quint64 _fadeStartTime{ usecTimestampNow() };
uint64_t _fadeStartTime{ usecTimestampNow() }; uint64_t _fadeStartTime{ usecTimestampNow() };
uint64_t _updateTime{ usecTimestampNow() }; // used when sorting/throttling render updates uint64_t _updateTime{ usecTimestampNow() }; // used when sorting/throttling render updates
bool _isFading{ _entitiesShouldFadeFunction() }; bool _isFading{ _entitiesShouldFadeFunction() };