[Bf-blender-cvs] [04ef339f748] soc-2020-custom-menus: Merge branch 'master' into soc-2020-custom-menus

[Campbell Barton]

Commit: 04ef339f7485dee1fa2149649adcd3b4566987e0
Author: Campbell Barton
Date:   Wed Aug 5 12:15:02 2020 +1000
Branches: soc-2020-custom-menus
https://developer.blender.org/rB04ef339f7485dee1fa2149649adcd3b4566987e0

Merge branch 'master' into soc-2020-custom-menus

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



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

diff --cc source/blender/makesrna/intern/rna_userdef.c
index 172f3ecd9cf,0567b22d23f..6d9e8b7d2d9
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@@ -178,22 -177,20 +178,23 @@@ static const EnumPropertyItem rna_enum_
  #  include "DNA_screen_types.h"
  
  #  include "BKE_blender.h"
 +#  include "BKE_blender_user_menu.h"
  #  include "BKE_global.h"
  #  include "BKE_idprop.h"
+ #  include "BKE_image.h"
  #  include "BKE_main.h"
  #  include "BKE_mesh_runtime.h"
  #  include "BKE_paint.h"
  #  include "BKE_pbvh.h"
  #  include "BKE_screen.h"
  
 +#  include "ED_screen.h"
 +
  #  include "DEG_depsgraph.h"
  
- #  include "GPU_draw.h"
  #  include "GPU_extensions.h"
  #  include "GPU_select.h"
+ #  include "GPU_texture.h"
  
  #  include "BLF_api.h"