[Bf-blender-cvs] [c58b5ac] master: Fix crash on undoing after 8690ea6

Antony Riakiotakis noreply at git.blender.org
Fri Jun 26 17:50:16 CEST 2015


Commit: c58b5acefdd1b8018bcd294b60cbd8e6cf4aa14b
Author: Antony Riakiotakis
Date:   Fri Jun 26 17:50:08 2015 +0200
Branches: master
https://developer.blender.org/rBc58b5acefdd1b8018bcd294b60cbd8e6cf4aa14b

Fix crash on undoing after 8690ea6

Forgot to clear the mutex when reloading the scene.

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

M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a3d2cef..9976594 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2763,7 +2763,8 @@ static void direct_link_nodetree(FileData *fd, bNodeTree *ntree)
 	
 	ntree->progress = NULL;
 	ntree->execdata = NULL;
-	
+	ntree->duplilock = NULL;
+
 	ntree->adt = newdataadr(fd, ntree->adt);
 	direct_link_animdata(fd, ntree->adt);




More information about the Bf-blender-cvs mailing list