From 45e1d341fac1da79fb8e86f95b6212f39b973399 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 14 May 2013 16:02:50 -0700 Subject: [PATCH] When we add voxels, add them with the selected color. --- interface/src/Application.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ed91a4fcd3..696e3d30ce 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -851,16 +851,16 @@ void Application::idle() { } } - if (_mouseMode == COLOR_VOXEL_MODE) { + if (_mouseMode == DELETE_VOXEL_MODE) { + // red indicates deletion + _mouseVoxel.red = 255; + _mouseVoxel.green = _mouseVoxel.blue = 0; + + } else { // _mouseMode == ADD_VOXEL_MODE || _mouseMode == COLOR_VOXEL_MODE QColor paintColor = _voxelPaintColor->data().value(); _mouseVoxel.red = paintColor.red(); _mouseVoxel.green = paintColor.green(); _mouseVoxel.blue = paintColor.blue(); - - } else if (_mouseMode == DELETE_VOXEL_MODE) { - // red indicates deletion - _mouseVoxel.red = 255; - _mouseVoxel.green = _mouseVoxel.blue = 0; } }