diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-27 03:49:13 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-27 03:49:13 +0400 |
| commit | 556912792ad3c37c294256a558c96b39f264e7b5 (patch) | |
| tree | 9b6ee8cf1ad92ee89c04f27a89be11599c5b40c0 /source/blender/render/intern/include/render_types.h | |
| parent | 9251d628db0abe599d927d79170025d8545c8ace (diff) | |
| parent | c84383301c5a2582e95259a7e4468a23a3566401 (diff) | |
Merged changes in the trunk up to revision 54110.
Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'source/blender/render/intern/include/render_types.h')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 3b8cd3c6aa5..deba6d165f2 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -62,6 +62,7 @@ struct RayFace; struct RenderEngine; struct ReportList; struct Main; +struct ImagePool; #define TABLEINITSIZE 1024 @@ -264,6 +265,8 @@ struct Render RenderStats i; struct ReportList *reports; + + struct ImagePool *pool; }; /* ------------------------------------------------------------------------- */ @@ -377,6 +380,7 @@ struct halosort { /* ------------------------------------------------------------------------- */ struct Material; struct MTFace; +struct ImagePool; typedef struct RadFace { float unshot[3], totrad[3]; @@ -409,6 +413,7 @@ typedef struct HaloRen { int pixels; unsigned int lay; struct Material *mat; + struct ImagePool *pool; } HaloRen; /* ------------------------------------------------------------------------- */ |