diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-13 16:44:58 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-13 16:44:58 +0300 |
| commit | 168604ecbe60ba909e3057cadf1c4047ea966d0c (patch) | |
| tree | a4699c125b9ace4e1d4efaff747a3ac0faed78c3 /source/blender/blenkernel/BKE_mask.h | |
| parent | 9d5cdf92b28217e29b6840eae8d0c44f033e3cf6 (diff) | |
Revert to master - those changes are globally valid, but remain incomplete,free-refcount-ids
and total new code is being done in id-remap anyway, not worth bothering with this for now...
Diffstat (limited to 'source/blender/blenkernel/BKE_mask.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_mask.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h index cc74869acfb..2f85db4d5d2 100644 --- a/source/blender/blenkernel/BKE_mask.h +++ b/source/blender/blenkernel/BKE_mask.h @@ -123,8 +123,8 @@ struct Mask *BKE_mask_new(struct Main *bmain, const char *name); struct Mask *BKE_mask_copy_nolib(struct Mask *mask); struct Mask *BKE_mask_copy(struct Mask *mask); -void BKE_mask_free(struct Mask *mask, const bool do_id_user); -void BKE_mask_unlink(struct Main *bmain, struct Mask *mask); +void BKE_mask_free_nolib(struct Mask *mask); +void BKE_mask_free(struct Main *bmain, 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, struct MovieClipUser *user, float r_co[2], const float co[2]); |