[Bf-blender-cvs] [6434154] master: Workaround T40046: Undo/redo crashes properties editor

Campbell Barton noreply at git.blender.org
Thu May 8 11:46:16 CEST 2014


Commit: 64341540148f63fe324d3413196c32092c464fbc
Author: Campbell Barton
Date:   Thu May 8 19:44:53 2014 +1000
https://developer.blender.org/rB64341540148f63fe324d3413196c32092c464fbc

Workaround T40046: Undo/redo crashes properties editor

Clear the path for now on undo

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

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

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a4f2601..066c4ea 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5969,7 +5969,10 @@ void blo_lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *cursc
 				else if (sl->spacetype == SPACE_BUTS) {
 					SpaceButs *sbuts = (SpaceButs *)sl;
 					sbuts->pinid = restore_pointer_by_name(newmain, sbuts->pinid, USER_IGNORE);
-					//XXX if (sbuts->ri) sbuts->ri->curtile = 0;
+
+					/* TODO: restore path pointers: T40046
+					 * (complicated because this contains data pointers too, not just ID)*/
+					MEM_SAFE_FREE(sbuts->path);
 				}
 				else if (sl->spacetype == SPACE_FILE) {
 					SpaceFile *sfile = (SpaceFile *)sl;




More information about the Bf-blender-cvs mailing list