merge with current trunk (just update)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1634 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 7 insertions, 3 deletions

diff --git a/unicode/src/menu/UMenuBackgroundFade.pas b/unicode/src/menu/UMenuBackgroundFade.pas
index b6174738..dc37da45 100644
--- a/unicode/src/menu/UMenuBackgroundFade.pas
+++ b/unicode/src/menu/UMenuBackgroundFade.pas
@@ -66,7 +66,8 @@ uses sdl,
      gl,

      glext,

      USkins,

-     UCommon;

+     UCommon,

+     UGraphic;

 

 constructor TMenuBackgroundFade.Create(const ThemedSettings: TThemeBackground);

 var texFilename: string;

@@ -121,7 +122,8 @@ begin
 

   if (UseTexture) then

   begin //Draw Texture to Screen

-    glClear(GL_DEPTH_BUFFER_BIT);

+    If (ScreenAct = 1) then //Clear just once when in dual screen mode

+      glClear(GL_DEPTH_BUFFER_BIT);

 

     glEnable(GL_TEXTURE_2D);

     glEnable(GL_BLEND);

@@ -149,7 +151,9 @@ begin
   end

   else

   begin //Clear Screen w/ progress Alpha + Color

-    glClear(GL_DEPTH_BUFFER_BIT);

+    If (ScreenAct = 1) then //Clear just once when in dual screen mode

+      glClear(GL_DEPTH_BUFFER_BIT);

+      

     glDisable(GL_TEXTURE_2D);

     glEnable(GL_BLEND);

     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);