diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-01-22 01:10:14 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-01-22 01:10:14 +0300 |
| commit | 9dd1bcfdfb3e32b57aee6ee7c1e2f0f5d2446da9 (patch) | |
| tree | 825b443374f78aa56aefe69800aeb436f1d66aef /source/blender/render/intern/include/render_types.h | |
| parent | 9f5a0deca9082674f0a91a7351e61aaf92be4350 (diff) | |
Render instancing can now also handle the same object in multiple,
non-animated dupligroups.
Diffstat (limited to 'source/blender/render/intern/include/render_types.h')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 6124870d63e..b400014d1bf 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -244,7 +244,7 @@ typedef struct ObjectRen { struct ObjectRen *next, *prev; struct Object *ob, *par; struct Scene *sce; - int index, psysindex; + int index, psysindex, flag; int totvert, totvlak, totstrand, tothalo; int vertnodeslen, vlaknodeslen, strandnodeslen, blohalen; @@ -257,6 +257,8 @@ typedef struct ObjectRen { char (*mtface)[32]; char (*mcol)[32]; int actmtface, actmcol; + + float obmat[4][4]; /* only used in convertblender.c, for instancing */ } ObjectRen; typedef struct ObjectInstanceRen { @@ -487,10 +489,14 @@ typedef struct LampRen { #define R_STRAND_BSPLINE 1 #define R_STRAND_B_UNITS 2 +/* objectren->flag */ +#define R_INSTANCEABLE 1 + /* objectinstance->flag */ #define R_DUPLI_TRANSFORMED 1 #define R_ENV_TRANSFORMED 2 #define R_TRANSFORMED (1|2) +#define R_DUPLI_ELEM 4 #endif /* RENDER_TYPES_H */ |