Skip to content

Commit c131084

Browse files
ArelochAreloch
authored
Merge pull request #2309 from suncaller/warning-purge
Remove redundant variables and clean up C4312 and C4305 warnings
2 parents 1740bc0 + 5e8e7e7 commit c131084

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+45
-94
lines changed

‎Engine/source/T3D/components/animation/animationComponent.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,6 @@ void AnimationComponent::advanceThreads(F32 dt)
621621
Thread& st = mAnimationThreads[i];
622622
if (st.thread && st.sequence != -1)
623623
{
624-
bool cyclic = getShape()->sequences[st.sequence].isCyclic();
625-
626624
if (!getShape()->sequences[st.sequence].isCyclic() &&
627625
!st.atEnd &&
628626
((st.timescale > 0.f) ? mOwnerShapeInstance->getPos(st.thread) >= 1.0 : mOwnerShapeInstance->getPos(st.thread) <= 0))

‎Engine/source/T3D/components/camera/cameraComponent.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,6 @@ bool CameraComponent::getCameraTransform(F32* pos,MatrixF* mat)
237237
{
238238
// Returns camera to world space transform
239239
// Handles first person / third person camera position
240-
bool isServer = isServerObject();
241-
242240
if (mTargetNodeIdx == -1)
243241
{
244242
if (mUseParentTransform)
@@ -479,7 +477,6 @@ void CameraComponent::setRotation(RotationF newRot)
479477
Frustum CameraComponent::getFrustum()
480478
{
481479
Frustum visFrustum;
482-
F32 left, right, top, bottom;
483480
F32 aspectRatio = mClientScreen.x / mClientScreen.y;
484481

485482
visFrustum.set(false, mDegToRad(mCameraFov), aspectRatio, 0.1f, 1000, mOwner->getTransform());

‎Engine/source/T3D/components/collision/collisionComponent.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,6 @@ PhysicsCollision* CollisionComponent::buildColShapes()
538538
for (S32 o = start; o < end; o++)
539539
{
540540
const TSShape::Object &object = shape->objects[o];
541-
const String &meshName = shape->names[object.nameIndex];
542541

543542
if (object.numMeshes <= detail.objectDetailNum)
544543
continue;

‎Engine/source/T3D/components/game/stateMachine.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ void StateMachine::readConditions(StateTransition &currentTransition)
152152
//get our first state
153153
StateTransition::Condition firstCondition;
154154
StateField firstField;
155-
bool fieldRead = false;
156155

157156
readFieldName(&firstField, reader);
158157
firstCondition.field = firstField;

‎Engine/source/T3D/components/game/triggerComponent.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,6 @@ bool TriggerComponent::testObject(SceneObject* enter)
239239
myList.setObject(mOwner);
240240

241241
myCI->buildPolyList(PLC_Collision, &myList, enterBox, sphere);
242-
243-
bool test = true;
244242
}
245243
}
246244
}

‎Engine/source/T3D/components/physics/playerControllerComponent.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,6 @@ void PlayerControllerComponent::updateMove()
330330
}
331331

332332
// Update current orientation
333-
bool doStandardMove = true;
334-
GameConnection* con = mOwner->getControllingClient();
335-
336333
MatrixF zRot;
337334
zRot.set(EulerF(0.0f, 0.0f, mOwner->getRotation().asEulerF().z));
338335

@@ -355,7 +352,6 @@ void PlayerControllerComponent::updateMove()
355352
mContactInfo.jump = false;
356353
mContactInfo.run = false;
357354

358-
bool jumpSurface = false, runSurface = false;
359355
if (!mOwner->isMounted())
360356
findContact(&mContactInfo.run, &mContactInfo.jump, &mContactInfo.contactNormal);
361357
if (mContactInfo.jump)
@@ -577,7 +573,6 @@ void PlayerControllerComponent::updatePos(const F32 travelTime)
577573
newPos = mPhysicsRep->move(mVelocity * travelTime, collisionList);
578574

579575
bool haveCollisions = false;
580-
bool wasFalling = mFalling;
581576
if (collisionList.getCount() > 0)
582577
{
583578
mFalling = false;

‎Engine/source/T3D/convexShape.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,8 +719,6 @@ bool ConvexShape::buildExportPolyList(ColladaUtils::ExportData* exportData, cons
719719
//Convex shapes only have the one 'level', so we'll just rely on the export post-process to back-fill
720720
if (isServerObject() && getClientObject())
721721
{
722-
ConvexShape* clientShape = dynamic_cast<ConvexShape*>(getClientObject());
723-
724722
exportData->meshData.increment();
725723

726724
//Prep a meshData for this shape in particular

‎Engine/source/T3D/entity.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,6 @@ void Entity::onPostAdd()
306306

307307
bool Entity::_setGameObject(void *object, const char *index, const char *data)
308308
{
309-
Entity *e = static_cast<Entity*>(object);
310-
311309
// Sanity!
312310
AssertFatal(data != NULL, "Cannot use a NULL asset Id.");
313311

@@ -513,8 +511,6 @@ U32 Entity::packUpdate(NetConnection *con, U32 mask, BitStream *stream)
513511

514512
for (U32 i = 0; i < mNetworkedComponents.size(); i++)
515513
{
516-
NetworkedComponent::UpdateState state = mNetworkedComponents[i].updateState;
517-
518514
if (mNetworkedComponents[i].updateState == NetworkedComponent::Adding)
519515
{
520516
const char* className = mComponents[mNetworkedComponents[i].componentIndex]->getClassName();
@@ -1381,7 +1377,6 @@ bool Entity::removeComponent(Component *comp, bool deleteComponent)
13811377
//to re-add them. Need to implement a clean clear function that will clear the local list, and only delete unused behaviors during an update.
13821378
void Entity::clearComponents(bool deleteComponents)
13831379
{
1384-
bool srv = isServerObject();
13851380
if (!deleteComponents)
13861381
{
13871382
while (mComponents.size() > 0)
@@ -1399,8 +1394,6 @@ void Entity::clearComponents(bool deleteComponents)
13991394
{
14001395
comp->onComponentRemove(); //in case the behavior needs to do cleanup on the owner
14011396

1402-
bool removed = mComponents.remove(comp);
1403-
14041397
//we only need to delete them on the server side. they'll be cleaned up on the client side
14051398
//via the ghosting system for us
14061399
if (isServerObject())
@@ -1663,7 +1656,6 @@ void Entity::notifyComponents(String signalFunction, String argA, String argB, S
16631656

16641657
void Entity::setComponentsDirty()
16651658
{
1666-
bool tmp = true;
16671659
/*if (mToLoadComponents.empty())
16681660
mStartComponentUpdate = true;
16691661
@@ -1694,7 +1686,6 @@ void Entity::setComponentsDirty()
16941686

16951687
void Entity::setComponentDirty(Component *comp, bool forceUpdate)
16961688
{
1697-
bool found = false;
16981689
for (U32 i = 0; i < mComponents.size(); i++)
16991690
{
17001691
if (mComponents[i]->getId() == comp->getId())

‎Engine/source/T3D/entity.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ Vector<T*> Entity::getComponents()
309309
Vector<T*> foundObjects;
310310

311311
T *curObj;
312-
Component* comp;
313312

314313
// Loop through our child objects.
315314
for (U32 i = 0; i < mComponents.size(); i++)

‎Engine/source/T3D/fx/particleEmitter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ void ParticleEmitterData::unpackData(BitStream* stream)
490490
#if defined(AFX_CAP_PARTICLE_POOLS)
491491
if (stream->readFlag())
492492
{
493-
pool_datablock = (afxParticlePoolData*)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast);
493+
pool_datablock = (afxParticlePoolData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast);
494494
stream->read(&pool_index);
495495
pool_depth_fade = stream->readFlag();
496496
pool_radial_fade = stream->readFlag();

‎Engine/source/T3D/gameFunctions.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,6 @@ void renderFrame(GFXTextureTargetRef* target, MatrixF transform, Frustum frustum
553553
GFX->setStateBlock(mDefaultGuiSB);
554554

555555
GFXTargetRef origTarget = GFX->getActiveRenderTarget();
556-
U32 origStyle = GFX->getCurrentRenderStyle();
557556

558557
// Clear the zBuffer so GUI doesn't hose object rendering accidentally
559558
GFX->clear(GFXClearZBuffer, ColorI(20, 20, 20), 1.0f, 0);

‎Engine/source/T3D/shapeBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3259,7 +3259,7 @@ void ShapeBase::unpackUpdate(NetConnection *con, BitStream *stream)
32593259
st.play = stream->readFlag();
32603260
if ( st.play )
32613261
{
3262-
st.profile = (SFXTrack*) stream->readRangedU32( DataBlockObjectIdFirst,
3262+
st.profile = (SFXTrack*)(uintptr_t)stream->readRangedU32( DataBlockObjectIdFirst,
32633263
DataBlockObjectIdLast );
32643264
}
32653265

‎Engine/source/T3D/shapeImage.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,7 @@ void ShapeBaseImageData::unpackData(BitStream* stream)
12021202
}
12031203

12041204
projectile = (stream->readFlag() ?
1205-
(ProjectileData*)stream->readRangedU32(DataBlockObjectIdFirst,
1205+
(ProjectileData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
12061206
DataBlockObjectIdLast) : 0);
12071207

12081208
cloakable = stream->readFlag();
@@ -1340,7 +1340,7 @@ void ShapeBaseImageData::unpackData(BitStream* stream)
13401340

13411341
if (stream->readFlag())
13421342
{
1343-
s.emitter = (ParticleEmitterData*) stream->readRangedU32(DataBlockObjectIdFirst,
1343+
s.emitter = (ParticleEmitterData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
13441344
DataBlockObjectIdLast);
13451345
stream->read(&s.emitterTime);
13461346

‎Engine/source/T3D/systems/render/meshRenderSystem.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ void MeshRenderSystem::render(SceneManager *sceneManager, SceneRenderState* stat
2121
for (U32 i = 0; i < count; i++)
2222
{
2323
//Server side items exist for data, but we don't actually render them
24-
bool isClient = MeshRenderSystemInterface::all[i]->mIsClient;
2524
if (!MeshRenderSystemInterface::all[i]->mIsClient)
2625
continue;
2726

28-
bool isStatic = MeshRenderSystemInterface::all[i]->mStatic;
2927
if (MeshRenderSystemInterface::all[i]->mStatic)
3028
continue;
3129

‎Engine/source/T3D/tsStatic.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,6 @@ bool TSStatic::buildExportPolyList(ColladaUtils::ExportData* exportData, const B
11311131
if (isServerObject() && getClientObject())
11321132
{
11331133
TSStatic* clientShape = dynamic_cast<TSStatic*>(getClientObject());
1134-
U32 numDetails = clientShape->mShapeInstance->getNumDetails() - 1;
11351134

11361135
exportData->meshData.increment();
11371136

‎Engine/source/T3D/vehicles/flyingVehicle.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,14 +282,14 @@ void FlyingVehicleData::unpackData(BitStream* stream)
282282
for (S32 i = 0; i < MaxSounds; i++) {
283283
sound[i] = NULL;
284284
if (stream->readFlag())
285-
sound[i] = (SFXProfile*)stream->readRangedU32(DataBlockObjectIdFirst,
285+
sound[i] = (SFXProfile*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
286286
DataBlockObjectIdLast);
287287
}
288288

289289
for (S32 j = 0; j < MaxJetEmitters; j++) {
290290
jetEmitter[j] = NULL;
291291
if (stream->readFlag())
292-
jetEmitter[j] = (ParticleEmitterData*)stream->readRangedU32(DataBlockObjectIdFirst,
292+
jetEmitter[j] = (ParticleEmitterData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
293293
DataBlockObjectIdLast);
294294
}
295295

‎Engine/source/T3D/vehicles/hoverVehicle.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,13 +411,13 @@ void HoverVehicleData::unpackData(BitStream* stream)
411411

412412
for (S32 i = 0; i < MaxSounds; i++)
413413
sound[i] = stream->readFlag()?
414-
(SFXProfile*) stream->readRangedU32(DataBlockObjectIdFirst,
414+
(SFXProfile*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
415415
DataBlockObjectIdLast): 0;
416416

417417
for (S32 j = 0; j < MaxJetEmitters; j++) {
418418
jetEmitter[j] = NULL;
419419
if (stream->readFlag())
420-
jetEmitter[j] = (ParticleEmitterData*)stream->readRangedU32(DataBlockObjectIdFirst,
420+
jetEmitter[j] = (ParticleEmitterData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
421421
DataBlockObjectIdLast);
422422
}
423423

‎Engine/source/T3D/vehicles/vehicle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ void VehicleData::unpackData(BitStream* stream)
374374
for (i = 0; i < Body::MaxSounds; i++) {
375375
body.sound[i] = NULL;
376376
if (stream->readFlag())
377-
body.sound[i] = (SFXProfile*)stream->readRangedU32(DataBlockObjectIdFirst,
377+
body.sound[i] = (SFXProfile*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
378378
DataBlockObjectIdLast);
379379
}
380380

‎Engine/source/T3D/vehicles/wheeledVehicle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ void WheeledVehicleData::unpackData(BitStream* stream)
494494
Parent::unpackData(stream);
495495

496496
tireEmitter = stream->readFlag()?
497-
(ParticleEmitterData*) stream->readRangedU32(DataBlockObjectIdFirst,
497+
(ParticleEmitterData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst,
498498
DataBlockObjectIdLast): 0;
499499

500500
for (S32 i = 0; i < MaxSounds; i++)

‎Engine/source/afx/afxEffectGroup.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ void afxEffectGroupData::unpack_fx(BitStream* stream, afxEffectList& fx)
133133
fx.clear();
134134
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
135135
for (int i = 0; i < n_fx; i++)
136-
fx.push_back((afxEffectWrapperData*)readDatablockID(stream));
136+
fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream));
137137
}
138138

139139
#define myOffset(field) Offset(field, afxEffectGroupData)

‎Engine/source/afx/afxEffectWrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ void afxEffectWrapperData::unpack_mods(BitStream* stream, afxXM_BaseData* mods[]
608608
{
609609
S32 n_mods = stream->readInt(6);
610610
for (int i = 0; i < n_mods; i++)
611-
mods[i] = (afxXM_BaseData*) readDatablockID(stream);
611+
mods[i] = (afxXM_BaseData*)(uintptr_t)readDatablockID(stream);
612612
}
613613

614614
bool afxEffectWrapperData::preload(bool server, String &errorStr)

‎Engine/source/afx/afxEffectron.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void afxEffectronData::unpack_fx(BitStream* stream, afxEffectList& fx)
147147
fx.clear();
148148
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
149149
for (int i = 0; i < n_fx; i++)
150-
fx.push_back((afxEffectWrapperData*)readDatablockID(stream));
150+
fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream));
151151
}
152152

153153
void afxEffectronData::packData(BitStream* stream)

‎Engine/source/afx/afxMagicSpell.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ void afxMagicSpellData::unpack_fx(BitStream* stream, afxEffectList& fx)
304304
fx.clear();
305305
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
306306
for (int i = 0; i < n_fx; i++)
307-
fx.push_back((afxEffectWrapperData*)readDatablockID(stream));
307+
fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream));
308308
}
309309

310310
void afxMagicSpellData::packData(BitStream* stream)
@@ -356,7 +356,7 @@ void afxMagicSpellData::unpackData(BitStream* stream)
356356
mDo_move_interrupts = stream->readFlag();
357357
stream->read(&mMove_interrupt_speed);
358358

359-
mMissile_db = (afxMagicMissileData*) readDatablockID(stream);
359+
mMissile_db = (afxMagicMissileData*)(uintptr_t)readDatablockID(stream);
360360
stream->read(&mLaunch_on_server_signal);
361361
stream->read(&mPrimary_target_types);
362362

‎Engine/source/afx/afxSelectron.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ void afxSelectronData::unpack_fx(BitStream* stream, afxEffectList& fx)
214214
fx.clear();
215215
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
216216
for (int i = 0; i < n_fx; i++)
217-
fx.push_back((afxEffectWrapperData*)readDatablockID(stream));
217+
fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream));
218218
}
219219

220220
void afxSelectronData::packData(BitStream* stream)

‎Engine/source/afx/afxSpellBook.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ void afxSpellBookData::unpackData(BitStream* stream)
128128

129129
do_id_convert = true;
130130
for (S32 i = 0; i < pages_per_book*spells_per_page; i++)
131-
rpg_spells[i] = (afxRPGMagicSpellData*) readDatablockID(stream);
131+
rpg_spells[i] = (afxRPGMagicSpellData*)(uintptr_t)readDatablockID(stream);
132132
}
133133

134134
DefineEngineMethod(afxSpellBookData, getPageSlotIndex, S32, (Point2I bookSlot),,

‎Engine/source/afx/ce/afxLightBase_T3D.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ void afxT3DLightBaseData::unpackData(BitStream* stream)
195195
stream->read( &mAnimState.animationPhase );
196196
stream->read( &mFlareScale );
197197

198-
mAnimationData = (LightAnimData*) readDatablockID(stream);
199-
mFlareData = (LightFlareData*) readDatablockID(stream);
198+
mAnimationData = (LightAnimData*)(uintptr_t)readDatablockID(stream);
199+
mFlareData = (LightFlareData*)(uintptr_t)readDatablockID(stream);
200200

201201
do_id_convert = true;
202202
}

‎Engine/source/afx/ce/afxPhraseEffect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ void afxPhraseEffectData::unpack_fx(BitStream* stream, afxEffectList& fx)
215215
fx.clear();
216216
S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS);
217217
for (int i = 0; i < n_fx; i++)
218-
fx.push_back((afxEffectWrapperData*)readDatablockID(stream));
218+
fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream));
219219
}
220220

221221
void afxPhraseEffectData::packData(BitStream* stream)

‎Engine/source/app/net/serverQuery.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1611,9 +1611,7 @@ static void handleExtendedMasterServerListResponse(BitStream* stream, U32 key, U
16111611
{
16121612
U16 packetIndex, packetTotal;
16131613
U32 i;
1614-
U16 serverCount, port;
1615-
U8 netNum[16];
1616-
char addressBuffer[256];
1614+
U16 serverCount;
16171615
NetAddress addr;
16181616

16191617
stream->read(&packetIndex);

‎Engine/source/forest/editor/forestUndo.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void ForestCreateUndoAction::addItem( ForestItemData *data,
5555
// We store the datablock ID rather than the actual pointer
5656
// since the pointer could go bad.
5757
SimObjectId dataId = item.getData()->getId();
58-
mItems.last().setData( (ForestItemData*)dataId );
58+
mItems.last().setData( (ForestItemData*)(uintptr_t)dataId );
5959
}
6060

6161
void ForestCreateUndoAction::redo()
@@ -110,7 +110,7 @@ void ForestDeleteUndoAction::removeItem( const ForestItem &item )
110110
SimObjectId dataId = item.getData()->getId();
111111

112112
mItems.push_back( item );
113-
mItems.last().setData( (ForestItemData*)dataId );
113+
mItems.last().setData( (ForestItemData*)(uintptr_t)dataId );
114114
mData->removeItem( item.getKey(), item.getPosition() );
115115
}
116116

@@ -171,7 +171,7 @@ void ForestUpdateAction::saveItem( const ForestItem &item )
171171
// We store the datablock ID rather than the actual pointer
172172
// since the pointer could go bad.
173173
SimObjectId dataId = item.getData()->getId();
174-
mItems.last().setData( (ForestItemData*)dataId );
174+
mItems.last().setData( (ForestItemData*)(uintptr_t)dataId );
175175
}
176176

177177
void ForestUpdateAction::_swapState()
@@ -215,7 +215,7 @@ void ForestUpdateAction::_swapState()
215215
item.getScale() );
216216

217217
// Save the state before this swap for the next swap.
218-
newItem.setData( (ForestItemData*)data->getId() );
218+
newItem.setData( (ForestItemData*)(uintptr_t)data->getId() );
219219
mItems.push_back( newItem );
220220
}
221221

0 commit comments

Comments
 (0)