Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 27 Sep 2018 12:51:33 +0000 (14:51 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 27 Sep 2018 12:51:33 +0000 (14:51 +0200)
1  2 
intern/ghost/GHOST_C-api.h
intern/ghost/GHOST_ISystem.h
intern/ghost/intern/GHOST_C-api.cpp
intern/ghost/intern/GHOST_System.cpp
intern/ghost/intern/GHOST_SystemCocoa.mm
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_window.c
source/creator/creator_args.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 863a88aeb2af2a29d3f583d95c7e4b106d57a80a,f8fe57b05a22a52dfdaba196b529ffedaaf9d159..2c80d0205f1334426d6e8691980b7426af423bbd
@@@ -504,7 -514,13 +504,8 @@@ static int arg_handle_print_help(int UN
        BLI_argsPrintArgDoc(ba, "--window-geometry");
        BLI_argsPrintArgDoc(ba, "--start-console");
        BLI_argsPrintArgDoc(ba, "--no-native-pixels");
+       BLI_argsPrintArgDoc(ba, "--no-window-focus");
  
 -
 -      printf("\n");
 -      printf("Game Engine Specific Options:\n");
 -      BLI_argsPrintArgDoc(ba, "-g");
 -
        printf("\n");
        printf("Python Options:\n");
        BLI_argsPrintArgDoc(ba, "--enable-autoexec");