[Bf-blender-cvs] [43bb8f1] master: Fix T49060: crashes during render with no apparent reason...

Bastien Montagne noreply at git.blender.org
Sat Aug 20 16:05:49 CEST 2016


Commit: 43bb8f12f44415c91f07ab5864aee7da51ef4a09
Author: Bastien Montagne
Date:   Sat Aug 20 16:03:33 2016 +0200
Branches: master
https://developer.blender.org/rB43bb8f12f44415c91f07ab5864aee7da51ef4a09

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.

===================================================================

M	source/blender/editors/space_time/space_time.c

===================================================================

diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
index 021c4a5..15eb154 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 */




More information about the Bf-blender-cvs mailing list