Moved Voxel and VoxelLibrary under the blocky mesher directory, since that's what they are actually used for

meshers/blocky/voxel.cpp

@@ -1,6 +1,6 @@
 #include "voxel.h"
-#include "meshers/blocky/voxel_mesher_blocky.h" // TODO Only required because of MAX_MATERIALS... could be enough inverting that dependency
 #include "voxel_library.h"
+#include "voxel_mesher_blocky.h" // TODO Only required because of MAX_MATERIALS... could be enough inverting that dependency
 
 #define STRLEN(x) (sizeof(x) / sizeof(x[0]))
 

meshers/blocky/voxel.h

@@ -1,7 +1,7 @@
 #ifndef VOXEL_TYPE_H
 #define VOXEL_TYPE_H
 
-#include "cube_tables.h"
+#include "../../cube_tables.h"
 #include <core/resource.h>
 
 class VoxelLibrary;

meshers/blocky/voxel_mesher_blocky.cpp

@@ -2,7 +2,6 @@
 #include "../../cube_tables.h"
 #include "../../util/array_slice.h"
 #include "../../util/utility.h"
-#include "../../voxel_library.h"
 #include <core/os/os.h>
 
 namespace {

meshers/blocky/voxel_mesher_blocky.h

@@ -2,9 +2,8 @@
 #define VOXEL_MESHER_BLOCKY_H
 
 #include "../../util/zprofiling.h"
-#include "../../voxel.h"
-#include "../../voxel_library.h"
 #include "../voxel_mesher.h"
+#include "voxel_library.h"
 #include <core/reference.h>
 #include <scene/resources/mesh.h>
 #include <vector>

register_types.cpp

@@ -5,6 +5,7 @@
 #include "generators/voxel_generator_noise.h"
 #include "generators/voxel_generator_noise_2d.h"
 #include "generators/voxel_generator_test.h"
+#include "meshers/blocky/voxel_library.h"
 #include "meshers/blocky/voxel_mesher_blocky.h"
 #include "meshers/dmc/voxel_mesher_dmc.h"
 #include "meshers/transvoxel/voxel_mesher_transvoxel.h"
@@ -16,7 +17,6 @@
 #include "terrain/voxel_map.h"
 #include "terrain/voxel_terrain.h"
 #include "voxel_buffer.h"
-#include "voxel_library.h"
 #include "voxel_memory_pool.h"
 #include "voxel_string_names.h"