[Bf-blender-cvs] [01fed3d] alembic_basic_io: Add a make local function to CacheFile id block.
Kévin Dietrich
noreply at git.blender.org
Thu Jul 21 17:32:19 CEST 2016
Commit: 01fed3dc55ff67b651055913d2b93c76cfffb5dd
Author: Kévin Dietrich
Date: Thu Jul 21 17:20:32 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB01fed3dc55ff67b651055913d2b93c76cfffb5dd
Add a make local function to CacheFile id block.
===================================================================
M source/blender/blenkernel/BKE_cachefile.h
M source/blender/blenkernel/intern/cachefile.c
M source/blender/blenkernel/intern/library.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_cachefile.h b/source/blender/blenkernel/BKE_cachefile.h
index c3f1781..8d94688 100644
--- a/source/blender/blenkernel/BKE_cachefile.h
+++ b/source/blender/blenkernel/BKE_cachefile.h
@@ -44,6 +44,8 @@ void BKE_cachefile_free(struct CacheFile *cache_file);
struct CacheFile *BKE_cachefile_copy(struct Main *bmain, struct CacheFile *cache_file);
+void BKE_cachefile_make_local(struct Main *bmain, struct CacheFile *cache_file, const bool lib_local);
+
void BKE_cachefile_reload(const struct Main *bmain, struct CacheFile *cache_file);
void BKE_cachefile_update_frame(struct Main *bmain, struct Scene *scene, float ctime, const float fps);
diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c
index 1c0d740..a5442f1 100644
--- a/source/blender/blenkernel/intern/cachefile.c
+++ b/source/blender/blenkernel/intern/cachefile.c
@@ -96,6 +96,11 @@ CacheFile *BKE_cachefile_copy(Main *bmain, CacheFile *cache_file)
return new_cache_file;
}
+void BKE_cachefile_make_local(Main *bmain, CacheFile *cache_file, const bool lib_local)
+{
+ BKE_id_make_local_generic(bmain, &cache_file->id, true, lib_local);
+}
+
void BKE_cachefile_reload(const Main *bmain, CacheFile *cache_file)
{
char filepath[FILE_MAX];
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 39bdb10..2b85113 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -416,7 +416,8 @@ bool id_make_local(Main *bmain, ID *id, const bool test, const bool lib_local)
if (!test) BKE_linestyle_make_local(bmain, (FreestyleLineStyle *)id, lib_local);
return true;
case ID_CF:
- return false; /* not implemented */
+ if (!test) BKE_cachefile_make_local(bmain, (CacheFile *)id, lib_local);
+ return true;
}
return false;
More information about the Bf-blender-cvs
mailing list