From a633808274f59f85a3cc37c57b80aecbac688757 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 1 Aug 2019 01:05:09 +0200 Subject: [PATCH] Renamed free to free_chunk, as it collided with Object's free(). --- world/voxel_chunk.cpp | 4 ++-- world/voxel_chunk.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/world/voxel_chunk.cpp b/world/voxel_chunk.cpp index 352d92d..15f4d1a 100644 --- a/world/voxel_chunk.cpp +++ b/world/voxel_chunk.cpp @@ -590,7 +590,7 @@ void VoxelChunk::free_debug_immediate_geometry() { } } -void VoxelChunk::free() { +void VoxelChunk::free_chunk() { free_debug_immediate_geometry(); free_main_mesh(); remove_colliders(); @@ -842,7 +842,7 @@ void VoxelChunk::_bind_methods() { ClassDB::bind_method(D_METHOD("create_debug_immediate_geometry"), &VoxelChunk::create_debug_immediate_geometry); ClassDB::bind_method(D_METHOD("free_debug_immediate_geometry"), &VoxelChunk::free_debug_immediate_geometry); - ClassDB::bind_method(D_METHOD("free"), &VoxelChunk::free); + ClassDB::bind_method(D_METHOD("free_chunk"), &VoxelChunk::free_chunk); ClassDB::bind_method(D_METHOD("draw_cross_voxels", "pos"), &VoxelChunk::draw_cross_voxels); ClassDB::bind_method(D_METHOD("draw_cross_voxels_fill", "pos", "fill"), &VoxelChunk::draw_cross_voxels_fill); diff --git a/world/voxel_chunk.h b/world/voxel_chunk.h index 3c01812..33278f4 100644 --- a/world/voxel_chunk.h +++ b/world/voxel_chunk.h @@ -129,7 +129,7 @@ public: void create_debug_immediate_geometry(); void free_debug_immediate_geometry(); - void free(); + void free_chunk(); void draw_cross_voxels(Vector3 pos); void draw_cross_voxels_fill(Vector3 pos, float fill);