diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-02 19:12:25 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-02 19:12:25 -0300 |
| commit | ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae (patch) | |
| tree | 5f9c387037d0142d40f7275575436483dc0a7237 /scene/3d/navigation_mesh.cpp | |
| parent | ab4126f51061277e87b41c48b40e7b54942d4eca (diff) | |
| parent | 45c5c89de961357a7042d9e1f063e288d7a510cf (diff) | |
| download | redot-engine-ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae.tar.gz | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene/3d/navigation_mesh.cpp')
| -rw-r--r-- | scene/3d/navigation_mesh.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scene/3d/navigation_mesh.cpp b/scene/3d/navigation_mesh.cpp index 386a0fab57..dfa8e5901f 100644 --- a/scene/3d/navigation_mesh.cpp +++ b/scene/3d/navigation_mesh.cpp @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -201,7 +201,7 @@ Ref<Mesh> NavigationMesh::get_debug_mesh() { arr.resize(Mesh::ARRAY_MAX); arr[Mesh::ARRAY_VERTEX]=varr; - debug_mesh->add_surface(Mesh::PRIMITIVE_LINES,arr); + debug_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_LINES,arr); return debug_mesh; } @@ -356,6 +356,11 @@ void NavigationMeshInstance::set_navigation_mesh(const Ref<NavigationMesh>& p_na if (navigation && navmesh.is_valid() && enabled) { nav_id = navigation->navmesh_create(navmesh,get_relative_transform(navigation),this); } + + if (debug_view && navmesh.is_valid()) { + debug_view->cast_to<MeshInstance>()->set_mesh( navmesh->get_debug_mesh() ); + } + update_gizmo(); update_configuration_warning(); |