diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-03-25 20:11:32 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-03-25 20:11:32 +0300 |
| commit | 11920f7880062c1efb68a4e141162b7ec060ca29 (patch) | |
| tree | 18cb137f954fcbdab56da53c4c3fcbee041f7692 /source/blender/render/extern/include/RE_pipeline.h | |
| parent | fb2fd884637f912a56302d331f4514ddd7b18374 (diff) | |
Bugfix #26195
When rendering, during processing scene data, drawing in 3d window
is now locked. Can get extended to more areas in UI easily.
At least this solves all crashes with conflicting memory access in
render && 3d drawing. Deleting objects via operators or delete
modifiers isn't locked yet.
Also fixed: crash on quitting a renderwindow when it was rendering.
Diffstat (limited to 'source/blender/render/extern/include/RE_pipeline.h')
| -rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index b64538cb452..4cc3207a05e 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -239,6 +239,7 @@ void RE_display_clear_cb(struct Render *re, void *handle, void (*f)(void *handle void RE_display_draw_cb (struct Render *re, void *handle, void (*f)(void *handle, RenderResult *rr, volatile struct rcti *rect)); 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, int)); void RE_test_break_cb (struct Render *re, void *handle, int (*f)(void *handle)); void RE_error_cb (struct Render *re, void *handle, void (*f)(void *handle, const char *str)); |