diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-11 22:27:15 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-11 22:30:02 +0300 |
| commit | 7212ebd09f9720883581221be923ae5e97ff5d76 (patch) | |
| tree | 546606626647d473ae9d4a037ce8e24e17943e08 /source/blender/blenkernel/intern/world.c | |
| parent | 3b8e0606e1cfa484971d09c5060a78dbadbe1569 (diff) | |
Remove usercount handling from BKE_id_expand_local.
Idea looked good, but we have too much custom situations here (some half-fake-sub-ID
being copied with their 'owner', animdata, etc.), let's let datablock copy functions
handle that themselves.
Also allows to safely call BKE_id_expand_local from all copy functions now (only when
copying linked data).
Diffstat (limited to 'source/blender/blenkernel/intern/world.c')
| -rw-r--r-- | source/blender/blenkernel/intern/world.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index ca9ff889e2d..9795a8174f8 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -143,6 +143,7 @@ World *BKE_world_copy(Main *bmain, World *wrld) BLI_listbase_clear(&wrldn->gpumaterial); if (ID_IS_LINKED_DATABLOCK(wrld)) { + BKE_id_expand_local(&wrldn->id); BKE_id_lib_local_paths(bmain, wrld->id.lib, &wrldn->id); } @@ -193,7 +194,7 @@ void BKE_world_make_local(Main *bmain, World *wrld) if (is_local) { if (!is_lib) { id_clear_lib_data(bmain, &wrld->id); - BKE_id_expand_local(&wrld->id, false); + BKE_id_expand_local(&wrld->id); } else { World *wrld_new = BKE_world_copy(bmain, wrld); |