MergeFix OctTree williambranch and andersbranch

This commit is contained in:
verysecrethero
2015-12-14 11:57:18 +01:00
parent 8abef7024d
commit 5fce7490a9
4 changed files with 58 additions and 42 deletions
@@ -7,6 +7,7 @@
#include <vector>
//last!
//#include "OldOctTree.h"
#define private public
#include <Engine\Core\OctTree.h>