[Bf-blender-cvs] [a3fd574a745] soc-2020-outliner: Merge branch 'master' into soc-2020-outliner

[Nathan Craddock]

Commit: a3fd574a745c453a3dec99cdfe7b7ed774668e5d
Author: Nathan Craddock
Date:   Thu Jul 23 21:03:51 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rBa3fd574a745c453a3dec99cdfe7b7ed774668e5d

Merge branch 'master' into soc-2020-outliner

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



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

diff --cc source/blender/editors/include/ED_buttons.h
index 268c05fe29e,455eee8580d..a2e9e3d7f5e
--- a/source/blender/editors/include/ED_buttons.h
+++ b/source/blender/editors/include/ED_buttons.h
@@@ -27,10 -27,10 +27,13 @@@
  extern "C" {
  #endif
  
 +struct bContext;
+ struct SpaceProperties;
  
 +void ED_buttons_set_context(const struct bContext *C, PointerRNA *ptr, const short context);
 +
+ int ED_buttons_tabs_list(struct SpaceProperties *sbuts, int *context_tabs_array);
+ 
  #ifdef __cplusplus
  }
  #endif