diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-10-31 19:38:53 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-10-31 19:38:53 +0300 |
| commit | c8de666cbe95403b4e902f10007ef94ec1808c04 (patch) | |
| tree | f15008e697c946a6488087109dbe3c524ebeabbe /source/blender/render | |
| parent | 3a72f02d800006d77a6f3ba9597f059c77ce6553 (diff) | |
| parent | 4e33d07565a4bc1c6702d0e4edf5c04392f7d5a6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/extern/include/RE_engine.h | 1 | ||||
| -rw-r--r-- | source/blender/render/intern/source/external_engine.c | 5 | ||||
| -rw-r--r-- | source/blender/render/intern/source/render_result.c | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index a4de7104071..82f9599c654 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -153,6 +153,7 @@ struct RenderResult *RE_engine_begin_result(RenderEngine *engine, int x, int y, void RE_engine_update_result(RenderEngine *engine, struct RenderResult *result); void RE_engine_add_pass(RenderEngine *engine, const char *name, int channels, const char *chan_id, const char *layername); void RE_engine_end_result(RenderEngine *engine, struct RenderResult *result, int cancel, int highlight, int merge_results); +struct RenderResult *RE_engine_get_result(struct RenderEngine *engine); const char *RE_engine_active_view_get(RenderEngine *engine); void RE_engine_active_view_set(RenderEngine *engine, const char *viewname); diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 2c1fcd037e6..f445ccbb494 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -330,6 +330,11 @@ void RE_engine_end_result(RenderEngine *engine, RenderResult *result, int cancel render_result_free(result); } +RenderResult *RE_engine_get_result(RenderEngine *engine) +{ + return engine->re->result; +} + /* Cancel */ int RE_engine_test_break(RenderEngine *engine) diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 8e6e6c9bb7d..df51cd3c2e6 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -116,8 +116,8 @@ void render_result_free(RenderResult *res) MEM_freeN(res->text); if (res->error) MEM_freeN(res->error); - if (res->stamp_data) - MEM_freeN(res->stamp_data); + + BKE_stamp_data_free(res->stamp_data); MEM_freeN(res); } |