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:
authorTon Roosendaal <ton@blender.org>2013-05-12 17:15:41 +0400
committerTon Roosendaal <ton@blender.org>2013-05-12 17:15:41 +0400
commit5fcf9b1d2fe94798178beeea8e31f54faac31414 (patch)
treeb58e66f5f63ea19a99a6dc0f99211ecc588ed24e /source/blender/render/intern/include
parent40535f5ef3baaef5ba4d8c1f7abbbb7f1efe3b77 (diff)
3D viewport render preview:
- Put it available as a default now (no debug value needed) - Fixed viewport size error, viewport was badly set (visible with border render, property regions) - Fixed hanging lock in conflict between drawing and initialize new renders.
Diffstat (limited to 'source/blender/render/intern/include')
-rw-r--r--source/blender/render/intern/include/render_types.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 4706cd02dd1..5bd0e9747d4 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -345,7 +345,8 @@ typedef struct ObjectInstanceRen {
Object *ob, *par;
int index, psysindex, lay;
- float mat[4][4], nmat[3][3]; /* nmat is inverse mat tranposed */
+ float mat[4][4], imat[4][4];
+ float nmat[3][3]; /* nmat is inverse mat tranposed */
short flag;
float dupliorco[3], dupliuv[2];