From 1844eb2c9e7302ba8835fd2ae091617894ab6f7a Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 24 Apr 2014 11:12:01 -0700 Subject: [PATCH] Pre CR tweaks --- libraries/voxels/src/VoxelTreeCommands.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libraries/voxels/src/VoxelTreeCommands.cpp b/libraries/voxels/src/VoxelTreeCommands.cpp index d1dc0f3560..a35096b5c7 100644 --- a/libraries/voxels/src/VoxelTreeCommands.cpp +++ b/libraries/voxels/src/VoxelTreeCommands.cpp @@ -21,7 +21,7 @@ struct SendVoxelsOperationArgs { }; bool sendVoxelsOperation(OctreeElement* element, void* extraData) { - VoxelTreeElement* voxel = (VoxelTreeElement*)element; + VoxelTreeElement* voxel = static_cast(element); SendVoxelsOperationArgs* args = (SendVoxelsOperationArgs*)extraData; if (voxel->isColored()) { const unsigned char* nodeOctalCode = voxel->getOctalCode(); @@ -117,19 +117,20 @@ DeleteVoxelCommand::~DeleteVoxelCommand() { } void DeleteVoxelCommand::redo() { - if (_voxel.s == 0) { + if (_voxel.s == 0.0f) { return; } if (_tree) { - _tree->deleteVoxelAt(_voxel.x, _voxel.y, _voxel.z, _voxel.s); } + _tree->deleteVoxelAt(_voxel.x, _voxel.y, _voxel.z, _voxel.s); + } if (_packetSender) { _packetSender->queueVoxelEditMessages(PacketTypeVoxelErase, 1, &_voxel); } } void DeleteVoxelCommand::undo() { - if (_voxel.s == 0) { + if (_voxel.s == 0.0f) { return; } @@ -157,4 +158,4 @@ void DeleteVoxelCommand::undo() { _packetSender->queueVoxelEditMessages(PacketTypeVoxelSet, 1, &_voxel); } } -} \ No newline at end of file +}