[Bf-blender-cvs] [45a5ddb57b2] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 45a5ddb57b2a94fde25d9ffab6dfd1bdd312152c
Author: Campbell Barton
Date:   Sat Jun 9 18:58:14 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB45a5ddb57b2a94fde25d9ffab6dfd1bdd312152c

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/include/UI_interface.h
index dee3104e6f4,94a0013d96b..42b78fa4800
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@@ -943,11 -886,8 +943,10 @@@ uiBlock *uiLayoutGetBlock(uiLayout *lay
  void uiLayoutSetFunc(uiLayout *layout, uiMenuHandleFunc handlefunc, void *argv);
  void uiLayoutSetContextPointer(uiLayout *layout, const char *name, struct PointerRNA *ptr);
  void uiLayoutContextCopy(uiLayout *layout, struct bContextStore *context);
- const char *uiLayoutIntrospect(uiLayout *layout); // XXX - testing
  struct MenuType *UI_but_menutype_get(uiBut *but);
 +struct PanelType *UI_but_paneltype_get(uiBut *but);
  void UI_menutype_draw(struct bContext *C, struct MenuType *mt, struct uiLayout *layout);
 +void UI_paneltype_draw(struct bContext *C, struct PanelType *pt, struct uiLayout *layout);
  
  /* Only for convenience. */
  void uiLayoutSetContextFromBut(uiLayout *layout, uiBut *but);