[Bf-blender-cvs] [e9ef7a8] master: Fix T41060: Wrong texture 'Object' mapping in 3DView Rendered mode with Blender Internal

[Sergey Sharybin]

Commit: e9ef7a83582bc3d1eb4c2b016cae8bcf295a752d
Author: Sergey Sharybin
Date:   Wed Aug 13 00:32:04 2014 +0600
Branches: master
https://developer.blender.org/rBe9ef7a83582bc3d1eb4c2b016cae8bcf295a752d

Fix T41060: Wrong texture 'Object' mapping in 3DView Rendered mode with Blender Internal

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

M	source/blender/editors/render/render_internal.c

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

diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index fd67115..e2d4af4 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -1192,7 +1192,17 @@ static void render_view3d_startjob(void *customdata, short *stop, short *do_upda
 	rstats = RE_GetStats(re);
 
 	if (update_flag & PR_UPDATE_VIEW) {
+		Object *object;
 		rp->resolution_divider = rp->start_resolution_divider;
+
+		/* Same as database_init_objects(), loop over all objects.
+		 * We might consider de-duplicating the code between this two cases.
+		 */
+		for (object = rp->bmain->object.first; object; object = object->id.next) {
+			float mat[4][4];
+			mul_m4_m4m4(mat, rp->viewmat, object->obmat);
+			invert_m4_m4(object->imat_ren, mat);
+        }
 	}
 
 	use_border = render_view3d_disprect(rp->scene, rp->ar, rp->v3d,