Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 9 Oct 2017 14:36:36 +0000 (01:36 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 9 Oct 2017 14:36:36 +0000 (01:36 +1100)
1  2 
CMakeLists.txt
intern/cycles/blender/addon/ui.py
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/makesrna/intern/rna_nodetree.c
source/creator/creator_args.c

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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))
  {