Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 04:38:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix merge issue

Browse source
This commit is contained in:
ZappoMan 2013-06-07 10:04:30 -07:00
parent 327c41e561
commit 736e38ceb0
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/voxels/src/VoxelNode.h
View file

@ -41,8 +41,6 @@ private:
void init(unsigned char * octalCode); void init(unsigned char * octalCode);
double _lastChanged;
public: public:
VoxelNode(); // root node constructor VoxelNode(); // root node constructor
VoxelNode(unsigned char * octalCode); // regular constructor VoxelNode(unsigned char * octalCode); // regular constructor

10
libraries/voxels/src/VoxelTree.cpp
View file

@ -274,16 +274,6 @@ public:
bool pathChanged; bool pathChanged;
}; };
class DeleteVoxelCodeFromTreeArgs {
public:
bool stage;
bool collapseEmptyTrees;
unsigned char* codeBuffer;
int lengthOfCode;
bool deleteLastChild;
bool pathChanged;
};
// Note: uses the codeColorBuffer format, but the color's are ignored, because // Note: uses the codeColorBuffer format, but the color's are ignored, because
// this only finds and deletes the node from the tree. // this only finds and deletes the node from the tree.
void VoxelTree::deleteVoxelCodeFromTree(unsigned char* codeBuffer, bool stage, bool collapseEmptyTrees) { void VoxelTree::deleteVoxelCodeFromTree(unsigned char* codeBuffer, bool stage, bool collapseEmptyTrees) {