mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2025-12-31 16:30:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed a merge conflict

Browse Source
This commit is contained in:
ElonOlsson
2021-09-10 17:19:03 -04:00
parent 505215964a 54b5327e50
commit ec7adfb71e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
View File

@@ -1059,15 +1059,15 @@ void RenderableFieldlinesSequence::update(const UpdateData& data) {
// Not in interval => set everything to false
_activeTriggerTimeIndex = -1;
mustLoadNewStateFromDisk = false;
needUpdate = false;
needUpdate = false;
}
if (mustLoadNewStateFromDisk) {
if (!_isLoadingStateFromDisk && !_newStateIsReady) {
_isLoadingStateFromDisk = true;
_isLoadingStateFromDisk = true;
mustLoadNewStateFromDisk = false;
std::string filePath = _sourceFiles[_activeTriggerTimeIndex];
std::thread readBinaryThread([this, f = std::move(filePath)] {
std::thread readBinaryThread([this, f = std::move(filePath)]() {
readNewState(f);
});
readBinaryThread.detach();
@@ -1130,7 +1130,7 @@ void RenderableFieldlinesSequence::readNewState(const std::string& filePath) {
}
// Unbind buffers and arrays
inline void unbindGL() {
void unbindGL() {
glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindVertexArray(0);
}