From 6cf28e98fbbd7e92ea4d2bc28009b3d108ddb1a1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 30 Apr 2021 22:35:47 +1000 Subject: Object: rename BKE_object_runtime_free, leave data cleared Rename BKE_object_runtime_free -> BKE_object_runtime_free_data, since the runtime pointer is part of the object, only the data is freed. Leave the data cleared to avoid accidental use, this is in keeping with other `*_free_data()` functions. --- source/blender/blenkernel/intern/object.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel/intern/object.c') diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 912bd5a4d69..02be16d1d28 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -5116,12 +5116,15 @@ void BKE_object_runtime_reset_on_copy(Object *object, const int UNUSED(flag)) /** * The function frees memory used by the runtime data, but not the runtime field itself. * - * The caller is expected to run #BKE_object_runtime_reset if the struct will be used again. + * All runtime data is cleared to ensure it's not used again, + * in keeping with other `_free_data(..)` functions. */ -void BKE_object_runtime_free(Object *object) +void BKE_object_runtime_free_data(Object *object) { /* Currently this is all that's needed. */ BKE_object_free_derived_caches(object); + + BKE_object_runtime_reset(object); } /** -- cgit v1.2.3