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 <bastien@blender.org>2020-10-08 12:36:11 +0300
committerBastien Montagne <bastien@blender.org>2020-10-08 12:40:55 +0300
commitdf5fe9718b18aa730662fb7b0fe43bd02b22d0bf (patch)
tree07eaa53b2339fb2909d9567227897f18e8bf51a9 /source/blender/blenkernel
parentfdb2240e4d06e9e552d6cd9ce4ec8d1ab2a6a448 (diff)
Cleanup: Remove `BKE_mask_copy_nolib()` and `BKE_mask_free()`.
Generic ID management code can now do those local temp copy handling, so no need for duplicated own code for that. No behavioral changes expected here.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_mask.h3
-rw-r--r--source/blender/blenkernel/intern/mask.c27
2 files changed, 0 insertions, 30 deletions
diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h
index 80092c1d61a..29072742f81 100644
--- a/source/blender/blenkernel/BKE_mask.h
+++ b/source/blender/blenkernel/BKE_mask.h
@@ -141,9 +141,6 @@ void BKE_mask_point_select_set_handle(struct MaskSplinePoint *point,
/* general */
struct Mask *BKE_mask_new(struct Main *bmain, const char *name);
-struct Mask *BKE_mask_copy_nolib(struct Mask *mask);
-
-void BKE_mask_free(struct Mask *mask);
void BKE_mask_coord_from_frame(float r_co[2], const float co[2], const float frame_size[2]);
void BKE_mask_coord_from_movieclip(struct MovieClip *clip,
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index 2f71d1ad99f..1f9f155ee55 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -1053,27 +1053,6 @@ Mask *BKE_mask_new(Main *bmain, const char *name)
return mask;
}
-/* TODO(sergey): Use generic BKE_libblock_copy_nolib() instead. */
-/* TODO(bastien): Use new super cool & generic BKE_id_copy_ex() instead! */
-Mask *BKE_mask_copy_nolib(Mask *mask)
-{
- Mask *mask_new;
-
- mask_new = MEM_dupallocN(mask);
-
- /*take care here! - we may want to copy anim data */
- mask_new->adt = NULL;
-
- BLI_listbase_clear(&mask_new->masklayers);
-
- BKE_mask_layer_copy_list(&mask_new->masklayers, &mask->masklayers);
-
- /* enable fake user by default */
- id_fake_user_set(&mask->id);
-
- return mask_new;
-}
-
void BKE_mask_point_free(MaskSplinePoint *point)
{
if (point->uw) {
@@ -1216,12 +1195,6 @@ void BKE_mask_layer_free_list(ListBase *masklayers)
}
}
-/** Free (or release) any data used by this mask (does not free the mask itself). */
-void BKE_mask_free(Mask *mask)
-{
- mask_free_data(&mask->id);
-}
-
void BKE_mask_coord_from_frame(float r_co[2], const float co[2], const float frame_size[2])
{
if (frame_size[0] == frame_size[1]) {