diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-09-01 22:16:54 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-09-01 22:16:54 +0300 |
| commit | 159ac3f638df5b1a569aaab8800de9671f0667c9 (patch) | |
| tree | 3c12321cf7ec128c1c5ca9d1bb3c77b62b356d9d /source/blender/blenloader | |
| parent | ff57589afc5e92c0c8c431850eccd7f6730631b2 (diff) | |
Fix T49224: Crash due to dangling value in 'Object.proxy_from' pointer.
Why/how this may happen remains a mystery, so for now simply clearing this runtime-only
pointer on Object reading...
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f5bfe1f4de6..57d499fbe91 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5303,6 +5303,9 @@ static void direct_link_object(FileData *fd, Object *ob) */ ob->recalc = 0; + /* XXX This should not be needed - but seems like it can happen in some cases, so for now play safe... */ + ob->proxy_from = NULL; + /* loading saved files with editmode enabled works, but for undo we like * to stay in object mode during undo presses so keep editmode disabled. * |