diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-01 21:09:17 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-01 21:26:57 +0300 |
| commit | 4c3be0bf52292add5cdf23be5f4affb76f1b747d (patch) | |
| tree | d46575c078b755ac833c3ff587feab6d92182d59 /source/blender/render/extern/include | |
| parent | 1f22e3f311e74031c3c01714117d759d3e3de3f1 (diff) | |
Fix T62073: Cycles random hangs rendering with Save Buffers on.
Diffstat (limited to 'source/blender/render/extern/include')
| -rw-r--r-- | source/blender/render/extern/include/RE_engine.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index e83d772eb6a..a4ec7ec6aa1 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -96,7 +96,7 @@ typedef struct RenderEngineType { ExtensionRNA ext; } RenderEngineType; -typedef void (*update_render_passes_cb_t)(struct RenderEngine *engine, struct Scene *scene, struct SceneRenderLayer *srl, +typedef void (*update_render_passes_cb_t)(void *userdata, struct Scene *scene, struct SceneRenderLayer *srl, const char *name, int channels, const char *chanid, int type); typedef struct RenderEngine { @@ -125,6 +125,7 @@ typedef struct RenderEngine { /* callback for render pass query */ ThreadMutex update_render_passes_mutex; update_render_passes_cb_t update_render_passes_cb; + void *update_render_passes_data; rctf last_viewplane; rcti last_disprect; @@ -165,7 +166,7 @@ bool RE_engine_is_external(struct Render *re); void RE_engine_frame_set(struct RenderEngine *engine, int frame, float subframe); void RE_engine_update_render_passes(struct RenderEngine *engine, struct Scene *scene, struct SceneRenderLayer *srl, - update_render_passes_cb_t callback); + update_render_passes_cb_t callback, void *callback_data); void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, struct SceneRenderLayer *srl, const char *name, int channels, const char *chanid, int type); |