Fix merge

2 files changed, 9 insertions, 8 deletions

diff --git a/source/blender/blenkernel/intern/image_partial_update.cc b/source/blender/blenkernel/intern/image_partial_update.cc
index 59d21d66f72..e95f68bee62 100644
--- a/source/blender/blenkernel/intern/image_partial_update.cc
+++ b/source/blender/blenkernel/intern/image_partial_update.cc
@@ -465,8 +465,8 @@ struct PartialUpdateRegisterImpl {
 static PartialUpdateRegister *image_partial_update_register_ensure(Image *image)
 {
   if (image->runtime.partial_update_register == nullptr) {
-    PartialUpdateRegisterImpl *partial_update_register = OBJECT_GUARDED_NEW(
-        PartialUpdateRegisterImpl);
+    PartialUpdateRegisterImpl *partial_update_register = MEM_new<PartialUpdateRegisterImpl>(
+        __func__);
     image->runtime.partial_update_register = wrap(partial_update_register);
   }
   return image->runtime.partial_update_register;
@@ -551,7 +551,7 @@ using namespace blender::bke::image::partial_update;
 // TODO(jbakker): cleanup parameter.
 struct PartialUpdateUser *BKE_image_partial_update_create(const struct Image *image)
 {
-  PartialUpdateUserImpl *user_impl = OBJECT_GUARDED_NEW(PartialUpdateUserImpl);
+  PartialUpdateUserImpl *user_impl = MEM_new<PartialUpdateUserImpl>(__func__);
 
 #ifdef NDEBUG
   user_impl->debug_image_ = image;
@@ -565,7 +565,7 @@ struct PartialUpdateUser *BKE_image_partial_update_create(const struct Image *im
 void BKE_image_partial_update_free(PartialUpdateUser *user)
 {
   PartialUpdateUserImpl *user_impl = unwrap(user);
-  OBJECT_GUARDED_DELETE(user_impl, PartialUpdateUserImpl);
+  MEM_delete(user_impl);
 }
 
 /* --- Image side --- */
@@ -575,7 +575,7 @@ void BKE_image_partial_update_register_free(Image *image)
   PartialUpdateRegisterImpl *partial_update_register = unwrap(
       image->runtime.partial_update_register);
   if (partial_update_register) {
-    OBJECT_GUARDED_DELETE(partial_update_register, PartialUpdateRegisterImpl);
+    MEM_delete(partial_update_register);
   }
   image->runtime.partial_update_register = nullptr;
 }
diff --git a/source/blender/draw/engines/image/image_engine.cc b/source/blender/draw/engines/image/image_engine.cc
index e3565de7445..840d4840f1b 100644
--- a/source/blender/draw/engines/image/image_engine.cc
+++ b/source/blender/draw/engines/image/image_engine.cc
@@ -148,7 +148,7 @@ static void IMAGE_engine_init(void *ved)
   IMAGE_shader_library_ensure();
   IMAGE_Data *vedata = (IMAGE_Data *)ved;
   if (vedata->instance_data == nullptr) {
-    vedata->instance_data = OBJECT_GUARDED_NEW(IMAGE_InstanceData);
+    vedata->instance_data = MEM_new<IMAGE_InstanceData>(__func__);
   }
 }
 
@@ -178,9 +178,10 @@ static void IMAGE_engine_free()
   IMAGE_shader_free();
 }
 
-static void IMAGE_instance_free(void *instance_data)
+static void IMAGE_instance_free(void *_instance_data)
 {
-  OBJECT_GUARDED_DELETE(instance_data, IMAGE_InstanceData);
+  IMAGE_InstanceData *instance_data = reinterpret_cast<IMAGE_InstanceData *>(_instance_data);
+  MEM_delete(instance_data);
 }
 
 /** \} */