浏览代码

Merge pull request #66530 from timothyqiu/navobs

Rémi Verschelde 2 年之前
父节点
当前提交
d3662d0e23
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      scene/2d/navigation_obstacle_2d.cpp
  2. 1 1
      scene/3d/navigation_obstacle.cpp

+ 1 - 1
scene/2d/navigation_obstacle_2d.cpp

@@ -134,7 +134,7 @@ NavigationObstacle2D::~NavigationObstacle2D() {
 }
 
 void NavigationObstacle2D::set_navigation(Navigation2D *p_nav) {
-	if (navigation == p_nav) {
+	if (navigation == p_nav && navigation != nullptr) {
 		return; // Pointless
 	}
 

+ 1 - 1
scene/3d/navigation_obstacle.cpp

@@ -140,7 +140,7 @@ NavigationObstacle::~NavigationObstacle() {
 }
 
 void NavigationObstacle::set_navigation(Navigation *p_nav) {
-	if (navigation == p_nav) {
+	if (navigation == p_nav && navigation != nullptr) {
 		return; // Pointless
 	}