From 3f36cd3f33e52d53d82a3a221e2a576cf26390a5 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 25 Jul 2016 17:37:34 +0200 Subject: Changed most of ID_IS_LINKED_foo checks as needed. Basically, due to new 'virtual' libraries & 'path' assets, we consider those 'virtualmy linked' IDs as: * Local for editing purpose (i.e. they are editable). * Linked for datablock management purposes (i.e. they can be made local, etc.). Note: all this is more like a quick hack to test 'file-based' asset repositories (like cloud) in comming weeks. I really do not think we should use that in the end, an full-featured 'overriding ID' system (as proposed in replacement of proxies for 2.8) would be much saner imho. --- source/blender/blenkernel/intern/packedFile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel/intern/packedFile.c') diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 489fc2f3710..08aca2a44a3 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -232,7 +232,7 @@ void packAll(Main *bmain, ReportList *reports, bool verbose) int tot = 0; for (ima = bmain->image.first; ima; ima = ima->id.next) { - if (BKE_image_has_packedfile(ima) == false && !ID_IS_LINKED_DATABLOCK(ima)) { + if (BKE_image_has_packedfile(ima) == false && !ID_IS_LINKED(ima)) { if (ima->source == IMA_SRC_FILE) { BKE_image_packfiles(reports, ima, ID_BLEND_PATH(bmain, &ima->id)); tot ++; @@ -245,14 +245,14 @@ void packAll(Main *bmain, ReportList *reports, bool verbose) } for (vfont = bmain->vfont.first; vfont; vfont = vfont->id.next) { - if (vfont->packedfile == NULL && !ID_IS_LINKED_DATABLOCK(vfont) && BKE_vfont_is_builtin(vfont) == false) { + if (vfont->packedfile == NULL && !ID_IS_LINKED(vfont) && BKE_vfont_is_builtin(vfont) == false) { vfont->packedfile = newPackedFile(reports, vfont->name, bmain->name); tot ++; } } for (sound = bmain->sound.first; sound; sound = sound->id.next) { - if (sound->packedfile == NULL && !ID_IS_LINKED_DATABLOCK(sound)) { + if (sound->packedfile == NULL && !ID_IS_LINKED(sound)) { sound->packedfile = newPackedFile(reports, sound->name, bmain->name); tot++; } -- cgit v1.2.3