Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-05-08 13:44:53 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-05-08 13:46:04 +0400
commit64341540148f63fe324d3413196c32092c464fbc (patch)
treef976e7e1ac968e783b4f916311f648c070200463
parent75d49b7f559aae2bcf85ac8666d87bf605adac8f (diff)
Workaround T40046: Undo/redo crashes properties editor
Clear the path for now on undo
-rw-r--r--source/blender/blenloader/intern/readfile.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a4f26017636..066c4ea67f1 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;