diff options
| author | Weizhen Huang <itsnotrj@gmail.com> | 2022-11-11 18:17:58 +0300 |
|---|---|---|
| committer | Weizhen Huang <itsnotrj@gmail.com> | 2022-11-11 18:17:58 +0300 |
| commit | dad3574a8c0b673efa9d7f7c890d9562e3f6a267 (patch) | |
| tree | 84dff4a90c34a44744c329de21a999289f9d209a /source/blender/render/RE_pipeline.h | |
| parent | e9260afa93068d0181de6e3223f65e7bb016aecc (diff) | |
| parent | dc8a1d38b73420428f9fb878386b99ebb69dd841 (diff) | |
Merge branch 'master' into soc-2022-many-lights-sampling
Diffstat (limited to 'source/blender/render/RE_pipeline.h')
| -rw-r--r-- | source/blender/render/RE_pipeline.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h index e9a90096dab..d12162c0b9a 100644 --- a/source/blender/render/RE_pipeline.h +++ b/source/blender/render/RE_pipeline.h @@ -398,7 +398,7 @@ void RE_display_update_cb(struct Render *re, void RE_stats_draw_cb(struct Render *re, void *handle, void (*f)(void *handle, RenderStats *rs)); void RE_progress_cb(struct Render *re, void *handle, void (*f)(void *handle, float)); void RE_draw_lock_cb(struct Render *re, void *handle, void (*f)(void *handle, bool lock)); -void RE_test_break_cb(struct Render *re, void *handle, int (*f)(void *handle)); +void RE_test_break_cb(struct Render *re, void *handle, bool (*f)(void *handle)); void RE_current_scene_update_cb(struct Render *re, void *handle, void (*f)(void *handle, struct Scene *scene)); |