Merge branch 'develop' into feature/vertex-refactor
Conflicts: library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl library/PolyVoxCore/source/VertexTypes.cpp
This commit is contained in:
commit
d69e840055
@ -0,0 +1 @@
|
||||
|
Loading…
x
Reference in New Issue
Block a user