diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-07-02 22:15:55 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-07-02 22:15:55 +0400 |
| commit | fdc59b8a40014c28e033f39cbf144565568d7058 (patch) | |
| tree | f0acaba90be9c2b0fac9b70e2010479fd8f02c51 /source/blender/render/intern/include | |
| parent | 9ae663154fd9f100c299afaab05a560b1a2a55a4 (diff) | |
| parent | 3ee2cb9cdb647729a1d62d2b2dab45813d938cc8 (diff) | |
Merge with trunk r38042
Diffstat (limited to 'source/blender/render/intern/include')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index b2535ebc9ea..13ca40bfd20 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -60,6 +60,7 @@ struct RenderBuckets; struct ObjectInstanceRen; struct RayObject; struct RayFace; +struct ReportList; struct Main; #define TABLEINITSIZE 1024 @@ -252,10 +253,9 @@ struct Render int (*test_break)(void *handle); void *tbh; - void (*error)(void *handle, const char *str); - void *erh; - RenderStats i; + + struct ReportList *reports; }; /* ------------------------------------------------------------------------- */ |