mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-05 02:20:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflicts

Browse Source
This commit is contained in:
Kollberg
2019-06-26 09:02:43 -04:00
parent 1dbb0b5b29 8654ff09ab
commit 65a0c17a09
17 changed files with 262 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/suntexturemanager.cpp
+1
View File
@@ -50,6 +50,7 @@ SunTextureManager::SunTextureManager()
void SunTextureManager::update(std::unique_ptr<ghoul::opengl::Texture> &texture)
{
std::string currentTime = getOpenSpaceDateTime();
if (_textureToUpload.empty() && currentTime != _activeTextureDate && (_textureListGPU.find(currentTime) != _textureListGPU.end()))
{