|
@@ -976,7 +976,7 @@ void AnimationState::computeHold(TrackEntry *entry) {
|
|
if (to != NULL && to->_holdPrevious) {
|
|
if (to != NULL && to->_holdPrevious) {
|
|
for (size_t i = 0; i < timelinesCount; i++) {
|
|
for (size_t i = 0; i < timelinesCount; i++) {
|
|
int id = timelines[i]->getPropertyId();
|
|
int id = timelines[i]->getPropertyId();
|
|
- if (!_propertyIDs.contains(id)) _propertyIDs.add(id);
|
|
|
|
|
|
+ if (!_propertyIDs.containsKey(id)) _propertyIDs.put(id, true);
|
|
timelineMode[i] = Hold;
|
|
timelineMode[i] = Hold;
|
|
}
|
|
}
|
|
return;
|
|
return;
|
|
@@ -988,10 +988,10 @@ void AnimationState::computeHold(TrackEntry *entry) {
|
|
for (; i < timelinesCount; ++i) {
|
|
for (; i < timelinesCount; ++i) {
|
|
Timeline *timeline = timelines[i];
|
|
Timeline *timeline = timelines[i];
|
|
int id = timeline->getPropertyId();
|
|
int id = timeline->getPropertyId();
|
|
- if (_propertyIDs.contains(id)) {
|
|
|
|
|
|
+ if (_propertyIDs.containsKey(id)) {
|
|
timelineMode[i] = Subsequent;
|
|
timelineMode[i] = Subsequent;
|
|
} else {
|
|
} else {
|
|
- _propertyIDs.add(id);
|
|
|
|
|
|
+ _propertyIDs.put(id, true);
|
|
|
|
|
|
if (to == NULL || timeline->getRTTI().isExactly(AttachmentTimeline::rtti) ||
|
|
if (to == NULL || timeline->getRTTI().isExactly(AttachmentTimeline::rtti) ||
|
|
timeline->getRTTI().isExactly(DrawOrderTimeline::rtti) ||
|
|
timeline->getRTTI().isExactly(DrawOrderTimeline::rtti) ||
|
|
@@ -1022,8 +1022,8 @@ void AnimationState::computeNotLast(TrackEntry *entry) {
|
|
for (size_t i = 0; i < timelinesCount; i++) {
|
|
for (size_t i = 0; i < timelinesCount; i++) {
|
|
if (timelines[i]->getRTTI().isExactly(AttachmentTimeline::rtti)) {
|
|
if (timelines[i]->getRTTI().isExactly(AttachmentTimeline::rtti)) {
|
|
AttachmentTimeline *timeline = static_cast<AttachmentTimeline *>(timelines[i]);
|
|
AttachmentTimeline *timeline = static_cast<AttachmentTimeline *>(timelines[i]);
|
|
- if (!_propertyIDs.contains(timeline->getSlotIndex()))
|
|
|
|
- _propertyIDs.add(timeline->getSlotIndex());
|
|
|
|
|
|
+ if (!_propertyIDs.containsKey(timeline->getSlotIndex()))
|
|
|
|
+ _propertyIDs.put(timeline->getSlotIndex(), true);
|
|
else
|
|
else
|
|
timelineMode[i] |= NotLast;
|
|
timelineMode[i] |= NotLast;
|
|
}
|
|
}
|