[Bf-blender-cvs] [94fd6df9fac] topbar: Merge branch 'blender2.8' into topbar

[Julian Eisel]

Commit: 94fd6df9fac5ae74b183d2ac672302ffcd8e703e
Author: Julian Eisel
Date:   Mon Oct 23 00:23:10 2017 +0200
Branches: topbar
https://developer.blender.org/rB94fd6df9fac5ae74b183d2ac672302ffcd8e703e

Merge branch 'blender2.8' into topbar

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



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

diff --cc source/blender/editors/include/UI_interface.h
index 482217cbe5e,97f63a64aad..589686cd205
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@@ -835,20 -832,10 +835,20 @@@ void UI_exit(void)
  #define UI_ITEM_R_FULL_EVENT    (1 << 6)
  #define UI_ITEM_R_NO_BG         (1 << 7)
  #define UI_ITEM_R_IMMEDIATE     (1 << 8)
 +#define UI_ITEM_R_COMPACT       (1 << 9)
  
 -/* uiTemplateOperatorPropertyButs flags */
 -#define UI_TEMPLATE_OP_PROPS_SHOW_TITLE 1
 -#define UI_TEMPLATE_OP_PROPS_SHOW_EMPTY 2
 +/* uiLayoutOperatorButs flags */
 +enum {
- 	UI_LAYOUT_OP_SHOW_TITLE       = (1 << 0),
- 	UI_LAYOUT_OP_SHOW_REDO_BUT    = (UI_LAYOUT_OP_SHOW_TITLE | (1 << 1)),
- 	UI_LAYOUT_OP_SHOW_EMPTY       = (1 << 2),
- 	UI_LAYOUT_OP_COMPACT          = (1 << 3),
++	UI_TEMPLATE_OP_PROPS_SHOW_TITLE       = (1 << 0),
++	UI_TEMPLATE_OP_PROPS_SHOW_REDO_BUT    = (UI_LAYOUT_OP_SHOW_TITLE | (1 << 1)),
++	UI_TEMPLATE_OP_PROPS_SHOW_EMPTY       = (1 << 2),
++	UI_TEMPLATE_OP_PROPS_COMPACT          = (1 << 3),
 +	/* Don't show the "Redo Unsupported" label */
- 	UI_LAYOUT_OP_HIDE_UNSUPPORTED = (1 << 4),
++	UI_TEMPLATE_OP_PROPS_HIDE_UNSUPPORTED = (1 << 4),
 +	/* Only show non-advanced op-properties by default and add a "More" button invoking
 +	 * redo popup with all properties. If all properties are advanced, show the first 2. */
- 	UI_LAYOUT_OP_SPLIT_ADVANCED   = (1 << 5),
++	UI_TEMPLATE_OP_PROPS_SPLIT_ADVANCED   = (1 << 5),
 +};
  
  /* used for transp checkers */
  #define UI_ALPHA_CHECKER_DARK 100