Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2019-01-14 18:15:15 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2019-01-15 13:09:16 +0300
commitcae3750ff95ff2c68f666b949ada969613200359 (patch)
treeeab3454882ffa3c8ce331de8533c176aaa822513 /source/blender/blenkernel/intern/library_override.c
parent6af97b84dfa286fc5c8efb2b0536ed1b87f591b0 (diff)
Cleanup: replace usages of deprecated BKE_libblock_free_ex by BKE_id_free_ex.
Diffstat (limited to 'source/blender/blenkernel/intern/library_override.c')
-rw-r--r--source/blender/blenkernel/intern/library_override.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/library_override.c b/source/blender/blenkernel/intern/library_override.c
index 714730b2f52..9688b50c17c 100644
--- a/source/blender/blenkernel/intern/library_override.c
+++ b/source/blender/blenkernel/intern/library_override.c
@@ -649,13 +649,13 @@ void BKE_override_static_update(Main *bmain, ID *local)
/* Again, horribly innefficient in our case, we need something off-Main (aka moar generic nolib copy/free stuff)! */
/* XXX And crashing in complex cases (e.g. because depsgraph uses same data...). */
- BKE_libblock_free_ex(bmain, tmp_id, true, false);
+ BKE_id_free_ex(bmain, tmp_id, LIB_ID_FREE_NO_UI_USER, true);
if (local->override_static->storage) {
/* We know this datablock is not used anywhere besides local->override->storage. */
/* XXX For until we get fully shadow copies, we still need to ensure storage releases
* its usage of any ID pointers it may have. */
- BKE_libblock_free_ex(bmain, local->override_static->storage, true, false);
+ BKE_id_free_ex(bmain, local->override_static->storage, LIB_ID_FREE_NO_UI_USER, true);
local->override_static->storage = NULL;
}
@@ -744,7 +744,7 @@ ID *BKE_override_static_operations_store_start(Main *bmain, OverrideStaticStorag
if (!RNA_struct_override_store(
bmain, &rnaptr_final, &rnaptr_reference, &rnaptr_storage, local->override_static))
{
- BKE_libblock_free_ex(override_storage, storage_id, true, false);
+ BKE_id_free_ex(override_storage, storage_id, LIB_ID_FREE_NO_UI_USER, true);
storage_id = NULL;
}
}
@@ -781,7 +781,7 @@ void BKE_override_static_operations_store_finalize(OverrideStaticStorage *overri
ID *id;
while ((id = lb->first)) {
- BKE_libblock_free_ex(override_storage, id, true, false);
+ BKE_id_free_ex(override_storage, id, LIB_ID_FREE_NO_UI_USER, true);
}
}