History

fix issue with copy

ZappoMan committed 12 years ago

Commit a60cf0f1 parent 63a82af3 files · +11 −16Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

interface/src/Application.cpp+2−5
@@ -1524,7 +1524,6 @@ bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) { · 1523 unmodified lines
15241524 SendVoxelsOperationArgs* args = (SendVoxelsOperationArgs*)extraData;
15251525 if (node->isColored()) {
15261526 const unsigned char* nodeOctalCode = node->getOctalCode();
1527−
15281527 unsigned char* codeColorBuffer = NULL;
15291528 int codeLength = 0;
15301529 int bytesInCode = 0;
@@ -1545,10 +1544,9 @@ bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) { · 14 unmodified lines
15451544 }
15461545
15471546 // copy the colors over
1548− codeColorBuffer[bytesInCode + RED_INDEX ] = node->getColor()[RED_INDEX ];
1547+ codeColorBuffer[bytesInCode + RED_INDEX] = node->getColor()[RED_INDEX];
15491548 codeColorBuffer[bytesInCode + GREEN_INDEX] = node->getColor()[GREEN_INDEX];
1550− codeColorBuffer[bytesInCode + BLUE_INDEX ] = node->getColor()[BLUE_INDEX ];
1551−
1549+ codeColorBuffer[bytesInCode + BLUE_INDEX] = node->getColor()[BLUE_INDEX];
15521550 getInstance()->_voxelEditSender.queueVoxelEditMessage(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE,
15531551 codeColorBuffer, codeAndColorLength);
15541552
@@ -1612,7 +1610,6 @@ void Application::pasteVoxelsToOctalCode(const unsigned char* octalCodeDestinati · 57 unmodified lines
16121610 // the server as an set voxel message, this will also rebase the voxels to the new location
16131611 SendVoxelsOperationArgs args;
16141612 args.newBaseOctCode = octalCodeDestination;
1615−
16161613 _sharedVoxelSystem.getTree()->recurseTreeWithOperation(sendVoxelsOperation, &args);
16171614
16181615 if (_sharedVoxelSystem.getTree() != &_clipboard) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t