diff --git a/Application/Layer.py b/Application/Layer.py index 655d835..c95bbd6 100644 --- a/Application/Layer.py +++ b/Application/Layer.py @@ -101,7 +101,7 @@ class Layer: s1 = self.exportOffset e1 = self.lastFrame - self.startFrame + self.exportOffset s2 = layer2.exportOffset - e2 = layer2.lastFrame - layer2.startFrame + self.exportOffset + e2 = layer2.lastFrame - layer2.startFrame + layer2.exportOffset if s2 >= s1 and s2 <= e1: return True diff --git a/Application/LayerManager.py b/Application/LayerManager.py index c133c0a..1819f1a 100644 --- a/Application/LayerManager.py +++ b/Application/LayerManager.py @@ -123,5 +123,5 @@ class LayerManager: self.layers[i].exportOffset += 20 * tries tries += 1 - if self.layers[i].exportOffset >= 300000: - break + #if self.layers[i].exportOffset >= 300000: + # break