Browse Source

Ensure ConvexPolygonShape support count variable is initialised

(cherry picked from commit 0d4d8925b7ebaf608e0b3c2abf0d8213d9ce95f7)
Marcel Admiraal 4 years ago
parent
commit
a3f4bd96c5
1 changed files with 2 additions and 1 deletions
  1. 2 1
      servers/physics_2d/shape_2d_sw.cpp

+ 2 - 1
servers/physics_2d/shape_2d_sw.cpp

@@ -543,6 +543,7 @@ void ConvexPolygonShape2DSW::get_supports(const Vector2 &p_normal, Vector2 *r_su
 
 	int support_idx = -1;
 	real_t d = -1e10;
+	r_amount = 0;
 
 	for (int i = 0; i < point_count; i++) {
 
@@ -563,7 +564,7 @@ void ConvexPolygonShape2DSW::get_supports(const Vector2 &p_normal, Vector2 *r_su
 		}
 	}
 
-	ERR_FAIL_COND(support_idx == -1);
+	ERR_FAIL_COND_MSG(support_idx == -1, "Convex polygon shape support not found.");
 
 	r_amount = 1;
 	r_supports[0] = points[support_idx].pos;