fixed conflicts

2026-01-19 10:21:30 -06:00 · 2019-07-02 14:58:53 -04:00
parent 49d88ab56b 4551631bd5
commit da6b115b89
13 changed files with 105 additions and 70 deletions
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -1196,11 +1196,8 @@ void RenderableFieldlinesSequence::update(const UpdateData& data) {
        computeSequenceEndTime();
    }
    
-    
    const bool isInInterval = (currentTime >= _startTimes[0]) &&
                              (currentTime < _sequenceEndTime);
-    
-    

    // Check if current time in OpenSpace is within sequence interval
    if (isInInterval) {