[Bf-blender-cvs] [634bf8e4fcb] property-search-ui: Merge branch 'master' into property-search-ui

[Hans Goudey]

Commit: 634bf8e4fcb73c1787e58f42bec380eda9b3df6e
Author: Hans Goudey
Date:   Mon Jul 27 12:34:08 2020 -0400
Branches: property-search-ui
https://developer.blender.org/rB634bf8e4fcb73c1787e58f42bec380eda9b3df6e

Merge branch 'master' into property-search-ui

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



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

diff --cc source/blender/editors/space_buttons/space_buttons.c
index ac0baeb1a68,67efd8f4b8e..63b91163125
--- a/source/blender/editors/space_buttons/space_buttons.c
+++ b/source/blender/editors/space_buttons/space_buttons.c
@@@ -48,11 -48,8 +48,9 @@@
  #include "RNA_define.h"
  #include "RNA_enum_types.h"
  
 +#include "UI_interface.h"
  #include "UI_resources.h"
  
- #include "GPU_glew.h"
- 
  #include "buttons_intern.h" /* own include */
  
  /* ******************** default callbacks for buttons space ***************** */