[Bf-blender-cvs] [159ac3f] master: Fix T49224: Crash due to dangling value in 'Object.proxy_from' pointer.

[Bastien Montagne]

Commit: 159ac3f638df5b1a569aaab8800de9671f0667c9
Author: Bastien Montagne
Date:   Thu Sep 1 21:16:54 2016 +0200
Branches: master
https://developer.blender.org/rB159ac3f638df5b1a569aaab8800de9671f0667c9

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...

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

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

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index f5bfe1f..57d499f 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.
 	 *