History

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

Leonardo Murillo committed 12 years ago

Commit 91defcf2 parents a13d7b0 bb41fe65 files · +30 −7Browse files

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

Unified · Split

interface/src/Application.cpp+0−1
@@ -2176,7 +2176,6 @@ void Application::updateMouseVoxels(float deltaTime, glm::vec3& mouseRayOrigin, · 2175 unmodified lines
2176 2176
2177 _mouseVoxel.s = 0.0f;2177 _mouseVoxel.s = 0.0f;
2178 bool wasInitialized = _mouseVoxelScaleInitialized;2178 bool wasInitialized = _mouseVoxelScaleInitialized;
2179 _mouseVoxelScaleInitialized = false;
2180 if (Menu::getInstance()->isVoxelModeActionChecked() &&2179 if (Menu::getInstance()->isVoxelModeActionChecked() &&
2181 (fabs(_myAvatar.getVelocity().x) +2180 (fabs(_myAvatar.getVelocity().x) +
2182 fabs(_myAvatar.getVelocity().y) +2181 fabs(_myAvatar.getVelocity().y) +

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