Merge with trunk r37677

2011-06-20 22:55:18 +00:00
parent adb81a0351 768184753a
commit 207911bdb3
150 changed files with 9573 additions and 7742 deletions
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4321,6 +4321,7 @@ static void direct_link_object(FileData *fd, Object *ob)
 		MEM_freeN(hook);
 	}
 	
+	ob->customdata_mask= 0;
 	ob->bb= NULL;
 	ob->derivedDeform= NULL;
 	ob->derivedFinal= NULL;