diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-08-20 17:03:33 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-08-20 17:03:33 +0300 |
| commit | 43bb8f12f44415c91f07ab5864aee7da51ef4a09 (patch) | |
| tree | 97062dc05ec91bc6a819e5ee87df3f457520a958 /source/blender/editors/space_time | |
| parent | 67dcad4011bd78be8143d301dfbb22ca2b0a0efe (diff) | |
Fix T49060: crashes during render with no apparent reason...
Was a concurrent access of pointcache from both particle system and UI (time space).
Pointcache not being threadsafe is really an issue to be addressed for its next version,
for now simply locking spacetime (like we already do with 3DView), not ideal fix
but it's working and safe for release.
Diffstat (limited to 'source/blender/editors/space_time')
| -rw-r--r-- | source/blender/editors/space_time/space_time.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index 021c4a54b0a..15eb154c757 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -813,6 +813,7 @@ void ED_spacetype_time(void) art->draw = time_main_region_draw; art->listener = time_main_region_listener; art->keymap = time_keymap; + art->lock = 1; /* Due to pointcache, see T4960. */ BLI_addhead(&st->regiontypes, art); /* regions: header */ |