[Libreoffice-commits] .: slideshow/source

[Kohei Yoshida]

 slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9981db9b2a66f3d9d2e1e5b85654bfdd6164b012
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Sun Dec 12 14:17:22 2010 -0500

    Accidental commit? We don't wanna comment these out for no reason.

diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
index 38c2d26..3a56dfa 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
@@ -1205,10 +1205,10 @@ void OGLTransitionImpl::preparePermShader()
             OGLShaders::glUniform1i( location, 0 );  // texture unit 0
         }
 
-        //glActiveTexture(GL_TEXTURE1);
+        glActiveTexture(GL_TEXTURE1);
         if( !maHelperTexture )
             initPermTexture( &maHelperTexture );
-        //glActiveTexture(GL_TEXTURE0);
+        glActiveTexture(GL_TEXTURE0);
 
         location = OGLShaders::glGetUniformLocation( mProgramObject, "permTexture" );
         if( location != -1 ) {
@@ -1243,9 +1243,9 @@ void OGLTransitionImpl::displaySlidesShaders( double nTime, ::sal_Int32 glLeavin
         }
     }
 
-    //glActiveTexture( GL_TEXTURE2 );
+    glActiveTexture( GL_TEXTURE2 );
     glBindTexture( GL_TEXTURE_2D, glEnteringSlideTex );
-    //glActiveTexture( GL_TEXTURE0 );
+    glActiveTexture( GL_TEXTURE0 );
 #endif
 
     displaySlide( nTime, glLeavingSlideTex, maLeavingSlidePrimitives, SlideWidthScale, SlideHeightScale );