[Bf-blender-cvs] [6ec43a765b7] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 6ec43a765b775960fd47df7ad450a521413012c0
Author: Campbell Barton
Date:   Tue Oct 10 01:36:36 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB6ec43a765b775960fd47df7ad450a521413012c0

Merge branch 'master' into blender2.8

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



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

diff --cc source/creator/creator_args.c
index c38f19397c3,21d03cc8265..841eef4c0e8
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@@ -1007,8 -1019,17 +1013,8 @@@ static int arg_handle_joystick_disable(
  	return 0;
  }
  
 -static const char arg_handle_glsl_disable_doc[] =
 -"\n\tDisable GLSL shading."
 -;
 -static int arg_handle_glsl_disable(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
 -{
 -	GPU_extensions_disable();
 -	return 0;
 -}
 -
  static const char arg_handle_audio_disable_doc[] =
- "\n\tForce sound system to None"
+ "\n\tForce sound system to None."
  ;
  static int arg_handle_audio_disable(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
  {