[Bf-blender-cvs] [0c3449e8a1a] uvimage-editor-drawing: Use draw manager cursor

[Jeroen Bakker]

Commit: 0c3449e8a1a994499871feebe19f8b906e15c4c6
Author: Jeroen Bakker
Date:   Fri Aug 21 11:13:23 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rB0c3449e8a1a994499871feebe19f8b906e15c4c6

Use draw manager cursor

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

M	source/blender/draw/intern/draw_view.c
M	source/blender/editors/space_image/space_image.c

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

diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c
index 51d6c8c96b0..06ccbe035f4 100644
--- a/source/blender/draw/intern/draw_view.c
+++ b/source/blender/draw/intern/draw_view.c
@@ -227,7 +227,6 @@ void DRW_draw_cursor_2d(void)
   glDisable(GL_DEPTH_TEST);
 
   if (is_cursor_visible_2d(draw_ctx)) {
-    /* TODO: this can fail big time! */
     SpaceImage *sima = (SpaceImage *)draw_ctx->space_data;
     int co[2];
     UI_view2d_view_to_region(&region->v2d, sima->cursor[0], sima->cursor[1], &co[0], &co[1]);
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index ea14f05389a..8a05ba9da73 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -753,7 +753,7 @@ static void image_main_region_draw(const bContext *C, ARegion *region)
                         C);
   }
 
-  if (show_uvedit || mask || show_curve) {
+  if ((show_uvedit || mask || show_curve) && !U.experimental.use_drw_image_editor) {
     UI_view2d_view_ortho(v2d);
     ED_image_draw_cursor(region, sima->cursor);
     UI_view2d_view_restore(C);