diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-14 05:15:08 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-14 05:15:08 +0400 |
| commit | 883117077bedb57d76af6ccd894fca3fa45407d2 (patch) | |
| tree | b89de7e37cbeee6dbc448eda152b037c19d59574 /source/blender/blenkernel/BKE_mask.h | |
| parent | 622ac250f94c6855d4deb5cee7156385badf62ae (diff) | |
fix for 2 crashes freeing masks
- freeing a mask from RNA BKE_libblock_free() twice on the mask.
- loading a new blend file would only free the mask and not unlink it from nodes - it would access freed memory.
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 9ce678d8988..51e301fec80 100644 --- a/source/blender/blenkernel/BKE_mask.h +++ b/source/blender/blenkernel/BKE_mask.h @@ -102,8 +102,8 @@ struct Mask *BKE_mask_new(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); -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]); |