[Bf-blender-cvs] [814ca40c639] master: Merge branch 'blender-v2.90-release'

[Jacques Lucke]

Commit: 814ca40c639c74c48ec5e5b1a078b3b9884a9fad
Author: Jacques Lucke
Date:   Tue Jul 28 16:37:01 2020 +0200
Branches: master
https://developer.blender.org/rB814ca40c639c74c48ec5e5b1a078b3b9884a9fad

Merge branch 'blender-v2.90-release'

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



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

diff --cc source/blender/gpu/GPU_framebuffer.h
index ef6be0b2778,0a43b2c58a0..db531cdef9b
--- a/source/blender/gpu/GPU_framebuffer.h
+++ b/source/blender/gpu/GPU_framebuffer.h
@@@ -28,11 -30,9 +30,9 @@@
  extern "C" {
  #endif
  
- #include "GPU_texture.h"
- 
  typedef struct GPUAttachment {
    struct GPUTexture *tex;
 -  int mip, layer;
 +  int layer, mip;
  } GPUAttachment;
  
  typedef enum eGPUFrameBufferBits {