[Bf-blender-cvs] [64e7065] master: Fix part T39643: Compositor renders blank Render Layer from other Scenes

[Sergey Sharybin]

Commit: 64e7065c9301fd78fcff8c7441b3325bd1566d02
Author: Sergey Sharybin
Date:   Fri Apr 11 19:15:39 2014 +0600
https://developer.blender.org/rB64e7065c9301fd78fcff8c7441b3325bd1566d02

Fix part T39643: Compositor renders blank Render Layer from other Scenes

Fixed the part with missing tiles highlight and render info when rendering
different scene via the render layers node.

Displaying of the rendered result for a different scene after the render
is finished is still not "fixed". That's an intended behavior actually
to display render result for an active scene.

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

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 27d2a19..158f9ba 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -885,7 +885,7 @@ void draw_image_main(const bContext *C, ARegion *ar)
 
 	/* render info */
 	if (ima && show_render)
-		draw_render_info(scene, ima, ar, zoomx, zoomy);
+		draw_render_info(sima->iuser.scene, ima, ar, zoomx, zoomy);
 }
 
 void draw_image_cache(const bContext *C, ARegion *ar)