From 253dbe71dcefabc7abfb992d800caa1d963324d1 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 7 Oct 2020 18:01:25 +0200 Subject: Refactor: remove `BKE__copy` functions. Those were only shallow wrappers around `BKE_id_copy`, barely used (even fully unused in some cases), and we want to get rid of those ID-specific helpers for the common ID management tasks. Also prevents weird custom behaviors (like `BKE_object_copy`, who was the only basic ID copy function to reset user count of the new copy to zero). Part of 71219. --- source/blender/blenkernel/intern/brush.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'source/blender/blenkernel/intern/brush.c') diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index e1524422c3b..3dfddbeed24 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -170,7 +170,7 @@ static void brush_make_local(Main *bmain, ID *id, const int flags) id_fake_user_set(&brush->id); } else { - Brush *brush_new = BKE_brush_copy(bmain, brush); /* Ensures FAKE_USER is set */ + Brush *brush_new = (Brush *)BKE_id_copy(bmain, &brush->id); /* Ensures FAKE_USER is set */ brush_new->id.us = 0; @@ -1531,11 +1531,6 @@ struct Brush *BKE_brush_first_search(struct Main *bmain, const eObjectMode ob_mo return NULL; } -Brush *BKE_brush_copy(Main *bmain, const Brush *brush) -{ - return (Brush *)BKE_id_copy(bmain, &brush->id); -} - void BKE_brush_debug_print_state(Brush *br) { /* create a fake brush and set it to the defaults */ -- cgit v1.2.3