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

[Nathan Craddock]

Commit: 19557d0d8264f5fd08fb464a267ca426174ee2cd
Author: Nathan Craddock
Date:   Wed Jul 29 16:41:06 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB19557d0d8264f5fd08fb464a267ca426174ee2cd

Merge branch 'master' into soc-2020-outliner

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



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

diff --cc source/blender/editors/space_buttons/buttons_context.c
index 827ab178fd4,9e5c630ec60..f7b5a275504
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@@ -532,8 -532,7 +532,8 @@@ static bool buttons_context_linestyle_p
  }
  #endif
  
- static int buttons_context_path(
 -static bool buttons_context_path(const bContext *C, ButsContextPath *path, int mainb, int flag)
++static bool buttons_context_path(
 +    const bContext *C, SpaceProperties *sbuts, ButsContextPath *path, int mainb, int flag)
  {
    /* Note we don't use CTX_data here, instead we get it from the window.
     * Otherwise there is a loop reading the context that we are setting. */