[Bf-blender-cvs] [2a3cb3150fe] uvimage-editor-drawing: Rebase latest master

[Jeroen Bakker]

Commit: 2a3cb3150fe511da44a50adce889266ea193ee7d
Author: Jeroen Bakker
Date:   Tue Sep 8 14:06:40 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rB2a3cb3150fe511da44a50adce889266ea193ee7d

Rebase latest master

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

M	source/blender/draw/engines/image/image_engine.c
M	source/blender/draw/intern/draw_manager.c

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

diff --git a/source/blender/draw/engines/image/image_engine.c b/source/blender/draw/engines/image/image_engine.c
index 436d373e684..9f1278b473b 100644
--- a/source/blender/draw/engines/image/image_engine.c
+++ b/source/blender/draw/engines/image/image_engine.c
@@ -94,12 +94,12 @@ static void image_gpu_texture_get(Image *image,
         }
         else if (ibuf->zbuf_float) {
           *r_gpu_texture = GPU_texture_create_2d(
-              ibuf->x, ibuf->y, GPU_R16F, ibuf->zbuf_float, NULL);
+              __func__, ibuf->x, ibuf->y, 0, GPU_R16F, ibuf->zbuf_float);
           *r_owns_texture = true;
         }
         else if (ibuf->rect_float && ibuf->channels == 1) {
           *r_gpu_texture = GPU_texture_create_2d(
-              ibuf->x, ibuf->y, GPU_R16F, ibuf->rect_float, NULL);
+              __func__, ibuf->x, ibuf->y, 0, GPU_R16F, ibuf->rect_float);
           *r_owns_texture = true;
         }
       }
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 8020ce962ae..203f8af130d 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2037,7 +2037,7 @@ void DRW_draw_render_loop_2d_ex(struct Depsgraph *depsgraph,
   drw_debug_init();
 
   /* No framebuffer allowed before drawing. */
-  BLI_assert(GPU_framebuffer_back_get() == NULL);
+  BLI_assert(GPU_framebuffer_active_get() == GPU_framebuffer_back_get());
   GPU_framebuffer_bind(DST.default_framebuffer);
   GPU_framebuffer_clear_depth_stencil(DST.default_framebuffer, 1.0f, 0xFF);