diff options
| author | Juan Linietsky | 2017-01-14 11:07:57 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-01-14 11:10:42 -0300 |
| commit | dcb95ec1473eff3f455909cd81c3cd50b1e1159b (patch) | |
| tree | 60343275911d48ebf993041dec92e1eac112b746 /scene/3d | |
| parent | 93ab45b6b5c4f8e0619e963156c983009d399a9d (diff) | |
| download | godot-dcb95ec1473eff3f455909cd81c3cd50b1e1159b.tar.gz godot-dcb95ec1473eff3f455909cd81c3cd50b1e1159b.tar.zst godot-dcb95ec1473eff3f455909cd81c3cd50b1e1159b.zip | |
removed duplicated functions in class hierarchy that were bound more than once
added a check to detect this case in the future
Diffstat (limited to 'scene/3d')
| -rw-r--r-- | scene/3d/mesh_instance.cpp | 2 | ||||
| -rw-r--r-- | scene/3d/spatial.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp index 66bad45c4..764aff1c0 100644 --- a/scene/3d/mesh_instance.cpp +++ b/scene/3d/mesh_instance.cpp @@ -298,7 +298,7 @@ void MeshInstance::_bind_methods() { ClassDB::bind_method(_MD("get_mesh:Mesh"),&MeshInstance::get_mesh); ClassDB::bind_method(_MD("set_skeleton_path","skeleton_path:NodePath"),&MeshInstance::set_skeleton_path); ClassDB::bind_method(_MD("get_skeleton_path:NodePath"),&MeshInstance::get_skeleton_path); - ClassDB::bind_method(_MD("get_aabb"),&MeshInstance::get_aabb); + ClassDB::bind_method(_MD("create_trimesh_collision"),&MeshInstance::create_trimesh_collision); ClassDB::set_method_flags("MeshInstance","create_trimesh_collision",METHOD_FLAGS_DEFAULT); ClassDB::bind_method(_MD("create_convex_collision"),&MeshInstance::create_convex_collision); diff --git a/scene/3d/spatial.cpp b/scene/3d/spatial.cpp index 63a27f355..6843a7e9b 100644 --- a/scene/3d/spatial.cpp +++ b/scene/3d/spatial.cpp @@ -823,7 +823,7 @@ void Spatial::_bind_methods() { ADD_PROPERTY( PropertyInfo(Variant::VECTOR3,"rotation",PROPERTY_HINT_NONE,"",0), _SCS("set_rotation"), _SCS("get_rotation") ); ADD_PROPERTY( PropertyInfo(Variant::VECTOR3,"scale",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_EDITOR), _SCS("set_scale"), _SCS("get_scale") ); ADD_GROUP("Visibility",""); - ADD_PROPERTYNO( PropertyInfo(Variant::BOOL,"visible"), _SCS("_set_visible_"), _SCS("_is_visible_") ); + ADD_PROPERTYNO( PropertyInfo(Variant::BOOL,"visible"), _SCS("set_visible"), _SCS("is_visible") ); //ADD_PROPERTY( PropertyInfo(Variant::TRANSFORM,"transform/local"), _SCS("set_transform"), _SCS("get_transform") ); ADD_SIGNAL( MethodInfo("visibility_changed" ) ); |