[Bf-blender-cvs] [db88e6a75bb] workspaces: Fix missing ID handling on lib-linking

Julian Eisel noreply at git.blender.org
Sun May 14 21:21:41 CEST 2017


Commit: db88e6a75bb2aa8b8a31632895f20b872f119a3a
Author: Julian Eisel
Date:   Sun May 14 03:48:06 2017 +0200
Branches: workspaces
https://developer.blender.org/rBdb88e6a75bb2aa8b8a31632895f20b872f119a3a

Fix missing ID handling on lib-linking

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

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

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 53a9ad5e0cb..7b461f45cbb 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2790,6 +2790,10 @@ static void lib_link_workspaces(FileData *fd, Main *bmain)
 		ID *id = BKE_workspace_id_get(workspace);
 		ListBase *layouts = BKE_workspace_layouts_get(workspace);
 
+		if ((id->tag & LIB_TAG_NEED_LINK) == 0) {
+			continue;
+		}
+		IDP_LibLinkProperty(id->properties, fd);
 		id_us_ensure_real(id);
 
 		BKE_WORKSPACE_LAYOUT_ITER_BEGIN (layout, layouts->first) {
@@ -2807,6 +2811,8 @@ static void lib_link_workspaces(FileData *fd, Main *bmain)
 				}
 			}
 		} BKE_WORKSPACE_LAYOUT_ITER_END;
+
+		id->tag &= ~LIB_TAG_NEED_LINK;
 	} BKE_WORKSPACE_ITER_END;
 }




More information about the Bf-blender-cvs mailing list