diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-01 21:29:26 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-01 21:29:26 +0300 |
| commit | a577499c7521c5fcfaefd58ec1d8940886563adc (patch) | |
| tree | 99282a1d920bd693933efeac4d69a6807bd0e974 /source/blender/render/extern | |
| parent | d16386e50bc104f9446a30e041a7b74f38b51ae9 (diff) | |
| parent | 4c3be0bf52292add5cdf23be5f4affb76f1b747d (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/render/extern')
| -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 9e0ac0087ee..cdd696e56bb 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -100,7 +100,7 @@ typedef struct RenderEngineType { ExtensionRNA ext; } RenderEngineType; -typedef void (*update_render_passes_cb_t)(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer, +typedef void (*update_render_passes_cb_t)(void *userdata, struct Scene *scene, struct ViewLayer *view_layer, const char *name, int channels, const char *chanid, int type); typedef struct RenderEngine { @@ -128,6 +128,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; @@ -168,7 +169,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 ViewLayer *view_layer, - 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 ViewLayer *view_layer, const char *name, int channels, const char *chanid, int type); |