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:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-08-12 22:32:04 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-08-12 22:32:29 +0400
commite9ef7a83582bc3d1eb4c2b016cae8bcf295a752d (patch)
tree4cd602e45b0144df9869fdb1c461371b30aa1fbb /source/blender/editors/render
parent4bd252d8c3924361782998760523e25452594d21 (diff)
Fix T41060: Wrong texture 'Object' mapping in 3DView Rendered mode with Blender Internal
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r--source/blender/editors/render/render_internal.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index fd67115808f..e2d4af45fb9 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,