diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2016-10-13 14:32:08 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2016-10-13 15:10:46 +0300 |
| commit | 5c651554e2f98bff1cfdff0a6a6f029453dc3309 (patch) | |
| tree | ff2a3fb6c6b95f681321ec08469de959206ddd25 /source/blender/blenkernel/BKE_object.h | |
| parent | 918e6cf4c9b74ff96ad06753ef9e541837eb3b22 (diff) | |
Proxy appending: re-establish link to proxies when they are made local
This allows appending of an entire scene from another blend file into this one,
even when that blend file contains proxified armatures.
This replaces the approach from commit 1cdc54dc7db85766.
Thanks @sergey for the help.
Diffstat (limited to 'source/blender/blenkernel/BKE_object.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_object.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 1b3e05d11ae..cf07a178fe8 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -108,6 +108,7 @@ struct Object *BKE_object_lod_matob_get(struct Object *ob, struct Scene *scene); struct Object *BKE_object_copy_ex(struct Main *bmain, struct Object *ob, bool copy_caches); struct Object *BKE_object_copy(struct Main *bmain, struct Object *ob); void BKE_object_make_local(struct Main *bmain, struct Object *ob, const bool lib_local); +void BKE_object_make_local_ex(struct Main *bmain, struct Object *ob, const bool lib_local, const bool clear_proxy); bool BKE_object_is_libdata(struct Object *ob); bool BKE_object_obdata_is_libdata(struct Object *ob); |