Skip to content

Commit dcb4e5b

Browse files
committed
Replace Animation::_clear() with explicit .clear() calls.
1 parent eb4a997 commit dcb4e5b

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

scene/resources/animation.cpp

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -948,50 +948,50 @@ void Animation::remove_track(int p_track) {
948948
case TYPE_POSITION_3D: {
949949
PositionTrack *tt = static_cast<PositionTrack *>(t);
950950
ERR_FAIL_COND_MSG(tt->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first.");
951-
_clear(tt->positions);
951+
tt->positions.clear();
952952

953953
} break;
954954
case TYPE_ROTATION_3D: {
955955
RotationTrack *rt = static_cast<RotationTrack *>(t);
956956
ERR_FAIL_COND_MSG(rt->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first.");
957-
_clear(rt->rotations);
957+
rt->rotations.clear();
958958

959959
} break;
960960
case TYPE_SCALE_3D: {
961961
ScaleTrack *st = static_cast<ScaleTrack *>(t);
962962
ERR_FAIL_COND_MSG(st->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first.");
963-
_clear(st->scales);
963+
st->scales.clear();
964964

965965
} break;
966966
case TYPE_BLEND_SHAPE: {
967967
BlendShapeTrack *bst = static_cast<BlendShapeTrack *>(t);
968968
ERR_FAIL_COND_MSG(bst->compressed_track >= 0, "Compressed tracks can't be manually removed. Call clear() to get rid of compression first.");
969-
_clear(bst->blend_shapes);
969+
bst->blend_shapes.clear();
970970

971971
} break;
972972
case TYPE_VALUE: {
973973
ValueTrack *vt = static_cast<ValueTrack *>(t);
974-
_clear(vt->values);
974+
vt->values.clear();
975975

976976
} break;
977977
case TYPE_METHOD: {
978978
MethodTrack *mt = static_cast<MethodTrack *>(t);
979-
_clear(mt->methods);
979+
mt->methods.clear();
980980

981981
} break;
982982
case TYPE_BEZIER: {
983983
BezierTrack *bz = static_cast<BezierTrack *>(t);
984-
_clear(bz->values);
984+
bz->values.clear();
985985

986986
} break;
987987
case TYPE_AUDIO: {
988988
AudioTrack *ad = static_cast<AudioTrack *>(t);
989-
_clear(ad->values);
989+
ad->values.clear();
990990

991991
} break;
992992
case TYPE_ANIMATION: {
993993
AnimationTrack *an = static_cast<AnimationTrack *>(t);
994-
_clear(an->values);
994+
an->values.clear();
995995

996996
} break;
997997
}
@@ -1137,11 +1137,6 @@ int Animation::_marker_insert(double p_time, Vector<MarkerKey> &p_keys, const Ma
11371137
return -1;
11381138
}
11391139

1140-
template <typename T>
1141-
void Animation::_clear(T &p_keys) {
1142-
p_keys.clear();
1143-
}
1144-
11451140
////
11461141

11471142
int Animation::position_track_insert_key(int p_track, double p_time, const Vector3 &p_position) {

scene/resources/animation.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,6 @@ class Animation : public Resource {
253253

254254
Vector<Track *> tracks;
255255

256-
template <typename T>
257-
void _clear(T &p_keys);
258-
259256
template <typename T, typename V>
260257
int _insert(double p_time, T &p_keys, const V &p_value);
261258

0 commit comments

Comments
 (0)