diff options
| author | MarianoGNU <marianognu.easyrpg@gmail.com> | 2015-10-16 23:21:39 -0300 |
|---|---|---|
| committer | MarianoGNU <marianognu.easyrpg@gmail.com> | 2015-10-16 23:21:39 -0300 |
| commit | a5ebb525000d8301f73377426a2c1924d70aaf86 (patch) | |
| tree | 55eaf1e0e6553dbb34d236b07a051689ae8f2493 /scene/3d/navigation.cpp | |
| parent | 553edf1f250f34ca0ef0703b13b4d601f609e491 (diff) | |
| parent | 17a90ddc0824bb51b5ea707f5d4d11aed301f91d (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
# Solved Conflicts:
# tools/editor/property_editor.cpp
Diffstat (limited to 'scene/3d/navigation.cpp')
| -rw-r--r-- | scene/3d/navigation.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/3d/navigation.cpp b/scene/3d/navigation.cpp index bfa8add09c..ce28350be0 100644 --- a/scene/3d/navigation.cpp +++ b/scene/3d/navigation.cpp @@ -295,12 +295,14 @@ Vector<Vector3> Navigation::get_simple_path(const Vector3& p_start, const Vector } } + if (!begin_poly || !end_poly) { //print_line("No Path Path"); return Vector<Vector3>(); //no path } + if (begin_poly==end_poly) { Vector<Vector3> path; |