History

Merge branch 'master' of https://github.com/worklist/hifi

Philip Rosedale committed 13 years ago

Commit ef8daff2 parents fcf20a7 f560f633 files · +30 −2Browse files

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

Unified · Split

interface/src/Application.cpp+2−1
@@ -2723,13 +2723,14 @@ void Application::displaySide(Camera& whichCamera) { · 2722 unmodified lines
27232723 if (_mouseVoxel.s != 0) {
27242724 glDisable(GL_LIGHTING);
27252725 glPushMatrix();
2726+ glScalef(TREE_SCALE, TREE_SCALE, TREE_SCALE);
2727+ renderMouseVoxelGrid(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s);
27262728 if (_addVoxelMode->isChecked()) {
27272729 // use a contrasting color so that we can see what we're doing
27282730 glColor3ub(_mouseVoxel.red + 128, _mouseVoxel.green + 128, _mouseVoxel.blue + 128);
27292731 } else {
27302732 glColor3ub(_mouseVoxel.red, _mouseVoxel.green, _mouseVoxel.blue);
27312733 }
2732− glScalef(TREE_SCALE, TREE_SCALE, TREE_SCALE);
27332734 glTranslatef(_mouseVoxel.x + _mouseVoxel.s*0.5f,
27342735 _mouseVoxel.y + _mouseVoxel.s*0.5f,
27352736 _mouseVoxel.z + _mouseVoxel.s*0.5f);

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