svn merge ^/trunk/blender -r50173:50179
authorCampbell Barton <ideasman42@gmail.com>
Fri, 24 Aug 2012 12:50:54 +0000 (12:50 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 24 Aug 2012 12:50:54 +0000 (12:50 +0000)
1  2 
source/blender/windowmanager/intern/wm_window.c

index ad1b80ed6510a64c65c0063447937a4b3ba431a1,b83b93454e6404dbe733e21483d847d502bb75e4..363d04b8433c81b90bb92f201d5892a5a2074499
@@@ -49,7 -49,6 +49,7 @@@
  #include "BLF_translation.h"
  
  #include "BKE_blender.h"
 +#include "BKE_colortools.h"
  #include "BKE_context.h"
  #include "BKE_library.h"
  #include "BKE_global.h"
@@@ -244,7 -243,7 +244,7 @@@ wmWindow *wm_window_copy(bContext *C, w
  
        win->drawmethod = -1;
        win->drawdata = NULL;
 -      
 +
        return win;
  }
  
@@@ -341,12 -340,6 +341,6 @@@ static void wm_window_add_ghostwindow(c
        wm_get_screensize(&scr_w, &scr_h);
        posy = (scr_h - win->posy - win->sizey);
        
- #if defined(__APPLE__) && !defined(GHOST_COCOA)
-       {
-               extern int macPrefState; /* creator.c */
-               initial_state += macPrefState;
-       }
- #endif
        /* Disable AA for now, as GL_SELECT (used for border, lasso, ... select)
         * doesn't work well when AA is initialized, even if not used. */
        ghostwin = GHOST_CreateWindow(g_system, title,