From 1b0143587d5f00bf710be687796a6b95cbc7f582 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 10 Oct 2014 02:11:36 +0600 Subject: Current tile highlight should use render data from the engine Otherwise tweaking resolution/border would affect the way tiles are highlighted. --- source/blender/editors/space_image/image_draw.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source') diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index 79c21bab01c..f41e237beb4 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -83,6 +83,7 @@ static void draw_render_info(Scene *scene, Image *ima, ARegion *ar, float zoomx, { RenderResult *rr; Render *re = RE_GetRender(scene->id.name); + RenderData *rd = RE_engine_get_render_data(re); rr = BKE_image_acquire_renderresult(scene, ima); @@ -110,9 +111,9 @@ static void draw_render_info(Scene *scene, Image *ima, ARegion *ar, float zoomx, glTranslatef(x, y, 0.0f); glScalef(zoomx, zoomy, 1.0f); - if (scene->r.mode & R_BORDER) { - glTranslatef((int)(-scene->r.border.xmin * scene->r.xsch * scene->r.size / 100.0f), - (int)(-scene->r.border.ymin * scene->r.ysch * scene->r.size / 100.0f), + if (rd->mode & R_BORDER) { + glTranslatef((int)(-rd->border.xmin * rd->xsch * rd->size / 100.0f), + (int)(-rd->border.ymin * rd->ysch * rd->size / 100.0f), 0.0f); } -- cgit v1.2.3