[Bf-blender-cvs] [4de1e673a41] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 4de1e673a411d14c5ab980d37cc3e1bb8b3d99ea
Author: Sergey Sharybin
Date:   Thu Sep 27 14:51:33 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB4de1e673a411d14c5ab980d37cc3e1bb8b3d99ea

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/creator/creator_args.c
index 863a88aeb2a,f8fe57b05a2..2c80d0205f1
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@@ -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");