[Bf-blender-cvs] [3ea4d3dc073] blender-v2.83-release: Fix (unreported) Image Editor UI drawing too dark

[Philipp Oeser]

Commit: 3ea4d3dc07311a5799f7102a1e4f5920db367c0e
Author: Philipp Oeser
Date:   Thu Apr 16 12:39:51 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB3ea4d3dc07311a5799f7102a1e4f5920db367c0e

Fix (unreported) Image Editor UI drawing too dark

Caused by rBf0221ff6674f.

Only draw the Image buffer itself in display space.

Differential Revision: https://developer.blender.org/D7449

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

M	source/blender/editors/space_image/image_draw.c
M	source/blender/editors/space_image/space_image.c

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

diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index 85f7f744abc..6037c1d2ec8 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -575,6 +575,9 @@ static void draw_image_buffer(const bContext *C,
                               float zoomx,
                               float zoomy)
 {
+  /* Image are still drawn in display space. */
+  glDisable(GL_FRAMEBUFFER_SRGB);
+
   int x, y;
   int sima_flag = sima->flag & ED_space_image_get_display_channel_mask(ibuf);
 
@@ -666,6 +669,8 @@ static void draw_image_buffer(const bContext *C,
       GPU_blend(false);
     }
   }
+
+  glEnable(GL_FRAMEBUFFER_SRGB);
 }
 
 static void draw_image_buffer_repeated(const bContext *C,
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 5c146a99efd..1e1d4373fea 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -669,14 +669,9 @@ static void image_main_region_draw(const bContext *C, ARegion *region)
   /* we set view2d from own zoom and offset each time */
   image_main_region_set_view2d(sima, region);
 
-  /* Image are still drawn in display space. */
-  glDisable(GL_FRAMEBUFFER_SRGB);
-
   /* we draw image in pixelspace */
   draw_image_main(C, region);
 
-  glEnable(GL_FRAMEBUFFER_SRGB);
-
   /* and uvs in 0.0-1.0 space */
   UI_view2d_view_ortho(v2d);