archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Render instancing can now also handle the same object in multiple,

Browse Source 
non-animated dupligroups.
This commit is contained in:
Brecht Van Lommel
2008-01-21 22:10:14 +00:00
parent 9f5a0deca9
commit 9dd1bcfdfb
7 changed files with 154 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/render/intern/include/render_types.h
View File

@@ -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 */