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

ZappoMan committed 13 years ago

Commit 23c6a902 parents 2f6b246 9dbb64a18 files · +452 −234Browse files

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

Unified · Split

@@ -12,7 +12,6 @@ · 11 unmodified lines
12	#include <fstream> // to load voxels from file	12	#include <fstream> // to load voxels from file
13	#include <SharedUtil.h>	13	#include <SharedUtil.h>
14	#include <OctalCode.h>	14	#include <OctalCode.h>
15	#include <AgentList.h>
16	#include "VoxelSystem.h"	15	#include "VoxelSystem.h"
17		16
18	const int MAX_VOXELS_PER_SYSTEM = 250000;	17	const int MAX_VOXELS_PER_SYSTEM = 250000;