xserver: Branch 'master'

[Michel Daenzer]

 composite/compwindow.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 5957aa6fdc580ccad4557eeefa0636ffad823f33 (from bcb23527421578bd4c9397d4c2c19cbefa22fc59)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Mon Jul 9 08:47:05 2007 +0200

    Fix regression from recent composite changes.
    
    One pWin->redirectDraw test was converted incorrectly, causing incorrect
    rendering in some cases.

diff --git a/composite/compwindow.c b/composite/compwindow.c
index 6633163..a4c4e6f 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -481,7 +481,7 @@ compReparentWindow (WindowPtr pWin, Wind
     /*
      * Reset pixmap pointers as appropriate
      */
-    if (pWin->parent && pWin->redirectDraw != RedirectDrawNone)
+    if (pWin->parent && pWin->redirectDraw == RedirectDrawNone)
 	compSetPixmap (pWin, (*pScreen->GetWindowPixmap) (pWin->parent));
     /*
      * Call down to next function