Commit: c307b13be1c0f9bbf53fe80db28af1a30a821a68
Author: Lukas Tönne
Date: Tue Jun 19 07:08:19 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rBc307b13be1c0f9bbf53fe80db28af1a30a821a68
Merge branch 'hair_guides' into hair_guides_grooming
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/readfile.c
index 0690aa33c16,0b36af0ee3d..bd52f7710a4
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -8547,14 -8486,11 +8542,14 @@@ static BHead *read_libblock(FileData *f
case ID_WS:
direct_link_workspace(fd, (WorkSpace *)id, main);
break;
+ case ID_GM:
+ direct_link_groom(fd, (Groom *)id);
+ break;
}
-
+
oldnewmap_free_unused(fd->datamap);
oldnewmap_clear(fd->datamap);
-
+
if (wrong_id) {
BKE_libblock_free(main, id);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
