[Bf-blender-cvs] [ca0d4d90c6b] property-search-ui-v2: Merge branch 'master' into property-search-ui-v2

[Hans Goudey]

Commit: ca0d4d90c6b9ca29aa17ea7cd8ea5c90f4b3f097
Author: Hans Goudey
Date:   Wed Sep 2 11:15:50 2020 -0500
Branches: property-search-ui-v2
https://developer.blender.org/rBca0d4d90c6b9ca29aa17ea7cd8ea5c90f4b3f097

Merge branch 'master' into property-search-ui-v2

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



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

diff --cc source/blender/editors/include/UI_interface.h
index 8da1c167245,4fc537ca5c2..80185e49980
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@@ -2421,10 -2405,11 +2421,13 @@@ void uiItemTabsEnumR_prop(uiLayout *lay
                            struct bContext *C,
                            struct PointerRNA *ptr,
                            PropertyRNA *prop,
 +                          struct PointerRNA *ptr_highlight,
 +                          PropertyRNA *prop_highlight,
                            bool icon_only);
  
+ /* Only for testing, inspecting layouts. */
+ const char *UI_layout_introspect(uiLayout *layout);
+ 
  /* UI Operators */
  typedef struct uiDragColorHandle {
    float color[3];