Browse Source

still perform passed in ival during transition even if no-loading-screen is True

Josh Wilson 18 years ago
parent
commit
6bcd255ec7
1 changed files with 4 additions and 3 deletions
  1. 4 3
      direct/src/showbase/Transitions.py

+ 4 - 3
direct/src/showbase/Transitions.py

@@ -148,15 +148,16 @@ class Transitions:
         fadeIn or call noFade.
         fadeIn or call noFade.
         lerp
         lerp
         """
         """
-        if base.config.GetBool('no-loading-screen',0):
-            return
-
         if (t == 0):
         if (t == 0):
             # Fade out immediately with no lerp
             # Fade out immediately with no lerp
             self.noTransitions()
             self.noTransitions()
             self.loadFade()
             self.loadFade()
             self.fade.reparentTo(render2d, FADE_SORT_INDEX)
             self.fade.reparentTo(render2d, FADE_SORT_INDEX)
             self.fade.setColor(self.alphaOn)
             self.fade.setColor(self.alphaOn)
+        elif base.config.GetBool('no-loading-screen',0):
+            self.transitionIval = finishIval
+            if self.transitionIval:
+                self.transitionIval.start()       
         else:
         else:
             # Create a sequence that lerps the color out, then
             # Create a sequence that lerps the color out, then
             # parents the fade to hidden
             # parents the fade to hidden