Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2020-09-21 12:39:32 +0300
committerJeroen Bakker <jeroen@blender.org>2020-09-21 12:39:32 +0300
commitabc90d6b036dce1b5003d487a266b8d48126fa1c (patch)
tree7431632734265bb627181ec651bdadd5650566a3 /source/blender/draw
parentd72b5785eb02741ff14121cf4bb8dcdd019ee786 (diff)
Fix T80931: Proporional Editing Cursor Draws Incorrect
The incorrect view was setup so it was drawn in pixel space. This patch changes it to use UV space.
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/intern/draw_manager.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index df1f4d8f405..d51042d4ae6 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2096,17 +2096,16 @@ void DRW_draw_render_loop_2d_ex(struct Depsgraph *depsgraph,
GPU_framebuffer_bind(dfbl->overlay_fb);
+ GPU_depth_test(GPU_DEPTH_NONE);
+ GPU_matrix_push_projection();
+ wmOrtho2(
+ region->v2d.cur.xmin, region->v2d.cur.xmax, region->v2d.cur.ymin, region->v2d.cur.ymax);
if (do_annotations) {
- GPU_depth_test(GPU_DEPTH_NONE);
- GPU_matrix_push_projection();
- wmOrtho2(
- region->v2d.cur.xmin, region->v2d.cur.xmax, region->v2d.cur.ymin, region->v2d.cur.ymax);
ED_annotation_draw_view2d(DST.draw_ctx.evil_C, true);
- GPU_matrix_pop_projection();
}
-
GPU_depth_test(GPU_DEPTH_NONE);
ED_region_draw_cb_draw(DST.draw_ctx.evil_C, DST.draw_ctx.region, REGION_DRAW_POST_VIEW);
+ GPU_matrix_pop_projection();
/* Callback can be nasty and do whatever they want with the state.
* Don't trust them! */
DRW_state_reset();