History

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

ZappoMan committed 13 years ago

Commit b0397e82 parents 46c6f2f bd56cde29 files · +1259 −915Browse files

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

Unified · Split

interface/src/VoxelSystem.cpp+3−0
@@ -899,11 +899,14 @@ bool VoxelSystem::removeOutOfViewOperation(VoxelNode* node, void* extraData) { · 898 unmodified lines
899 899
900bool VoxelSystem::isViewChanging() {900bool VoxelSystem::isViewChanging() {
901 bool result = false; // assume the best901 bool result = false; // assume the best
902
903/** TEMPORARY HACK ******
902 // If our viewFrustum has changed since our _lastKnowViewFrustum904 // If our viewFrustum has changed since our _lastKnowViewFrustum
903 if (_viewFrustum && !_lastKnowViewFrustum.matches(_viewFrustum)) {905 if (_viewFrustum && !_lastKnowViewFrustum.matches(_viewFrustum)) {
904 result = true;906 result = true;
905 _lastKnowViewFrustum = *_viewFrustum; // save last known907 _lastKnowViewFrustum = *_viewFrustum; // save last known
906 }908 }
909**/
907 return result;910 return result;
908}911}
909 912

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