diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2020-06-05 09:41:09 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2020-06-05 09:41:35 +0300 |
commit | fe6be70875bca64e555d1cbedf1c2160493cf0e2 (patch) | |
tree | 96a78a9737f091dfc884a232f28d8e0f33337967 /source/blender/blenkernel | |
parent | e3a32a22bf9dbed18d7718ea4a0d66759c933a3b (diff) |
CleanUp: Introduce BKE_fcurve_create
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_fcurve.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/fcurve.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/ipo.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/nla.c | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h index 1eb5da974ce..b310d66d4bd 100644 --- a/source/blender/blenkernel/BKE_fcurve.h +++ b/source/blender/blenkernel/BKE_fcurve.h @@ -179,7 +179,7 @@ int BKE_fcm_envelope_find_index(struct FCM_EnvelopeData *array, #define BEZT_BINARYSEARCH_THRESH 0.01f /* was 0.00001, but giving errors */ /* -------- Data Management -------- */ - +struct FCurve *BKE_fcurve_create(void); void free_fcurve(struct FCurve *fcu); struct FCurve *copy_fcurve(const struct FCurve *fcu); diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index c0843e049f3..5eb1b756ac7 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -58,7 +58,11 @@ static CLG_LogRef LOG = {"bke.fcurve"}; /* ************************** Data-Level Functions ************************* */ - +FCurve *BKE_fcurve_create(void) +{ + FCurve *fcu = MEM_callocN(sizeof(FCurve), __func__); + return fcu; +} /* ---------------------- Freeing --------------------------- */ /* Frees the F-Curve itself too, so make sure BLI_remlink is called before calling this... */ diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 780c3c2f14a..a2dfbefdb2c 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -1341,7 +1341,7 @@ static void icu_to_fcurves(ID *id, int totbits; /* allocate memory for a new F-Curve */ - fcu = MEM_callocN(sizeof(FCurve), "FCurve"); + fcu = BKE_fcurve_create(); /* convert driver */ if (icu->driver) { diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 4ef68b91a84..97b09d10ede 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -1499,7 +1499,7 @@ void BKE_nlastrip_validate_fcurves(NlaStrip *strip) /* add one if not found */ if (fcu == NULL) { /* make new F-Curve */ - fcu = MEM_callocN(sizeof(FCurve), "NlaStrip FCurve"); + fcu = BKE_fcurve_create(); BLI_addtail(&strip->fcurves, fcu); /* set default flags */ @@ -1530,7 +1530,7 @@ void BKE_nlastrip_validate_fcurves(NlaStrip *strip) /* add one if not found */ if (fcu == NULL) { /* make new F-Curve */ - fcu = MEM_callocN(sizeof(FCurve), "NlaStrip FCurve"); + fcu = BKE_fcurve_create(); BLI_addtail(&strip->fcurves, fcu); /* set default flags */ |