[Bf-blender-cvs] [cd2dfacfa57] master: Merge branch 'blender-v2.91-release'

[Jeroen Bakker]

Commit: cd2dfacfa574f99acb06c0d020d96b2be714aa20
Author: Jeroen Bakker
Date:   Thu Nov 12 09:14:05 2020 +0100
Branches: master
https://developer.blender.org/rBcd2dfacfa574f99acb06c0d020d96b2be714aa20

Merge branch 'blender-v2.91-release'

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



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

diff --cc source/blender/editors/sculpt_paint/paint_utils.c
index 6139adaea1a,9855f8e9d40..beffb97bf3f
--- a/source/blender/editors/sculpt_paint/paint_utils.c
+++ b/source/blender/editors/sculpt_paint/paint_utils.c
@@@ -64,8 -64,9 +64,9 @@@
  #include "IMB_imbuf.h"
  #include "IMB_imbuf_types.h"
  
 -#include "RE_render_ext.h"
 +#include "RE_texture.h"
  
+ #include "ED_image.h"
  #include "ED_screen.h"
  #include "ED_view3d.h"