[Bf-blender-cvs] [58dc1146154] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 58dc114615449b8fc13e3b05ec3c21390547f5c7
Author: Campbell Barton
Date:   Mon Nov 6 00:07:19 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB58dc114615449b8fc13e3b05ec3c21390547f5c7

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/interface/interface_region_tooltip.c
index e3d90ceb7a2,ace1afb79aa..70e0f07ea6c
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@@ -307,65 -306,6 +307,65 @@@ static void ui_tooltip_region_free_cb(A
  /** \name ToolTip Creation
   * \{ */
  
 +static uiTooltipData *ui_tooltip_data_from_keymap(bContext *C, wmKeyMap *keymap)
 +{
 +	char buf[512];
 +
 +	/* create tooltip data */
 +	uiTooltipData *data = MEM_callocN(sizeof(uiTooltipData), "uiTooltipData");
 +
 +	BLI_assert(data->fields_len < MAX_TOOLTIP_LINES);
 +
 +	for (wmKeyMapItem *kmi = keymap->items.first; kmi; kmi = kmi->next) {
 +		wmOperatorType *ot = WM_operatortype_find(kmi->idname, true);
 +		if (ot != NULL) {
 +			/* Tip */
 +			{
 +				uiTooltipField *field = text_field_add(
 +				        data, &(uiTooltipFormat){
 +				            .style = UI_TIP_STYLE_NORMAL,
 +				            .color_id = UI_TIP_LC_MAIN,
 +				            .is_pad = true,
 +				        });
 +				field->text = BLI_strdup(ot->description[0] ? ot->description : ot->name);
 +			}
 +			/* Shortcut */
 +			{
 +				uiTooltipField *field = text_field_add(
 +				        data, &(uiTooltipFormat){
 +				            .style = UI_TIP_STYLE_NORMAL,
 +				            .color_id = UI_TIP_LC_NORMAL,
 +				        });
 +				bool found = false;
- 				if (WM_keymap_item_to_string(kmi, false, sizeof(buf), buf)) {
++				if (WM_keymap_item_to_string(kmi, false, buf, sizeof(buf))) {
 +					found = true;
 +				}
 +				field->text = BLI_sprintfN(TIP_("Shortcut: %s"), found ? buf : "None");
 +			}
 +
 +			/* Python */
 +			{
 +				uiTooltipField *field = text_field_add(
 +				        data, &(uiTooltipFormat){
 +				            .style = UI_TIP_STYLE_NORMAL,
 +				            .color_id = UI_TIP_LC_PYTHON,
 +				        });
 +				char *str = WM_operator_pystring_ex(C, NULL, false, false, ot, kmi->ptr);
 +				WM_operator_pystring_abbreviate(str, 32);
 +				field->text = BLI_sprintfN(TIP_("Python: %s"), str);
 +				MEM_freeN(str);
 +			}
 +		}
 +	}
 +	if (data->fields_len == 0) {
 +		MEM_freeN(data);
 +		return NULL;
 +	}
 +	else {
 +		return data;
 +	}
 +}
 +
  static uiTooltipData *ui_tooltip_data_from_button(bContext *C, uiBut *but)
  {
  	uiStringInfo but_tip = {BUT_GET_TIP, NULL};
diff --cc source/blender/gpu/intern/gpu_draw.c
index 9f1fdcfe551,427e179f29a..b77847d6206
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@@ -2036,9 -2197,9 +2036,9 @@@ int GPU_scene_object_lights(SceneLayer 
  	/* disable all lights */
  	for (int count = 0; count < 8; count++)
  		GPU_basic_shader_light_set(count, NULL);
 -	
 +
  	/* view direction for specular is not computed correct by default in
- 	 * opengl, so we set the settings ourselfs */
+ 	 * opengl, so we set the settings ourselves */
  	GPU_basic_shader_light_set_viewer(!ortho);
  
  	int count = 0;
diff --cc source/blender/windowmanager/wm_event_system.h
index 7e217122561,9977e73f2fd..c14517f1662
--- a/source/blender/windowmanager/wm_event_system.h
+++ b/source/blender/windowmanager/wm_event_system.h
@@@ -68,11 -68,10 +68,11 @@@ typedef struct wmEventHandler 
  
  	/* drop box handler */
  	ListBase *dropboxes;
 -
 +	/* manipulator handler */
 +	struct wmManipulatorMap *manipulator_map;
  } wmEventHandler;
  
- /* custom types for handlers, for signalling, freeing */
+ /* custom types for handlers, for signaling, freeing */
  enum {
  	WM_HANDLER_DEFAULT,
  	WM_HANDLER_FILESELECT