[Bf-blender-cvs] [1b01435] blender-v2.72-release: Current tile highlight should use render data from the engine

[Sergey Sharybin]

Commit: 1b0143587d5f00bf710be687796a6b95cbc7f582
Author: Sergey Sharybin
Date:   Fri Oct 10 02:11:36 2014 +0600
Branches: blender-v2.72-release
https://developer.blender.org/rB1b0143587d5f00bf710be687796a6b95cbc7f582

Current tile highlight should use render data from the engine

Otherwise tweaking resolution/border would affect the way tiles are highlighted.

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

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

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

diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index 79c21ba..f41e237 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);
 			}