diff --git a/editor/vox/vox_mesh_importer.cpp b/editor/vox/vox_mesh_importer.cpp index 4334cace..b58bff00 100644 --- a/editor/vox/vox_mesh_importer.cpp +++ b/editor/vox/vox_mesh_importer.cpp @@ -65,7 +65,7 @@ struct ForEachModelInstanceArgs { template static Error for_each_model_instance_in_scene_graph( - const vox::Data &data, int node_id, Transform transform, int depth, F &f) { + const vox::Data &data, int node_id, Transform transform, int depth, F f) { // ERR_FAIL_COND_V(depth > 10, ERR_INVALID_DATA); const vox::Node *vox_node = data.get_node(node_id); @@ -106,7 +106,7 @@ static Error for_each_model_instance_in_scene_graph( } template -void for_each_model_instance(const vox::Data &vox_data, F &f) { +void for_each_model_instance(const vox::Data &vox_data, F f) { if (vox_data.get_model_count() == 0) { return; } diff --git a/storage/funcs.h b/storage/funcs.h index 35dcfee5..cdf0d078 100644 --- a/storage/funcs.h +++ b/storage/funcs.h @@ -210,8 +210,8 @@ Vector3i transform_3d_array_zxy(Span src_grid, Span dst_grid, Vector ERR_FAIL_COND_V(!basis.x.is_unit_vector(), src_size); ERR_FAIL_COND_V(!basis.y.is_unit_vector(), src_size); ERR_FAIL_COND_V(!basis.z.is_unit_vector(), src_size); - ERR_FAIL_COND_V(src_grid.size() != src_size.volume(), src_size); - ERR_FAIL_COND_V(dst_grid.size() != src_size.volume(), src_size); + ERR_FAIL_COND_V(src_grid.size() != static_cast(src_size.volume()), src_size); + ERR_FAIL_COND_V(dst_grid.size() != static_cast(src_size.volume()), src_size); const int xa = basis.x.x != 0 ? 0 : basis.x.y != 0 ? 1 : 2; const int ya = basis.y.x != 0 ? 0 : basis.y.y != 0 ? 1 : 2;