From 58c511fb0149339b8942bb2124c215fd70219b63 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Tue, 21 Apr 2015 18:33:33 +0200 Subject: Stamp refactoring: Write those on render result during rendering, so we can cleanly write a render result image after rendering. --- source/blender/render/extern/include/RE_pipeline.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/render/extern') diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 20678b29d0e..39e17c28162 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -49,6 +49,7 @@ struct Scene; struct SceneRenderLayer; struct EnvMap; struct RenderResult; +struct StampData; /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* this include is what is exposed of render to outside world */ @@ -171,6 +172,8 @@ typedef struct RenderResult { /* render info text */ char *text; char *error; + + struct StampData *stamp_data; } RenderResult; @@ -261,7 +264,7 @@ void RE_init_threadcount(Render *re); /* the main processor, assumes all was set OK! */ void RE_TileProcessor(struct Render *re); -bool RE_WriteRenderViewsImage(struct ReportList *reports, struct RenderResult *rr, struct Scene *scene, struct Object *camera, const bool stamp, char *name); +bool RE_WriteRenderViewsImage(struct ReportList *reports, struct RenderResult *rr, struct Scene *scene, const bool stamp, char *name); bool RE_WriteRenderViewsMovie(struct ReportList *reports, struct RenderResult *rr, struct Scene *scene, struct RenderData *rd, struct bMovieHandle *mh, const size_t width, const size_t height, void **movie_ctx_arr, const size_t totvideos, bool preview); -- cgit v1.2.3