diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-11 21:45:57 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-11 22:30:02 +0300 |
| commit | 3c8f22a528b2a2236b8f05ecd69a62e721704944 (patch) | |
| tree | 9acf3737166b7363c0eee57d17f196ae39c0230f /source/blender/blenkernel/intern/image.c | |
| parent | c3996b792a75b867491c345661c8a5271101866c (diff) | |
Use new generic BKE_id_expand_local() for make_local() for image/material/texture/world.
As said in previous commits, did not touch to copy functions for now, due to ntree issues...
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 5c223d824ef..4d506746ef5 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -468,12 +468,6 @@ Image *BKE_image_copy(Main *bmain, Image *ima) return nima; } -static void extern_local_image(Image *UNUSED(ima)) -{ - /* Nothing to do: images don't link to other IDs. This function exists to - * match id_make_local pattern. */ -} - void BKE_image_make_local(Main *bmain, Image *ima) { bool is_local = false, is_lib = false; @@ -492,7 +486,7 @@ void BKE_image_make_local(Main *bmain, Image *ima) if (is_local) { if (!is_lib) { id_clear_lib_data(bmain, &ima->id); - extern_local_image(ima); + BKE_id_expand_local(&ima->id, false); } else { Image *ima_new = BKE_image_copy(bmain, ima); |