Merge pull request #2504 from vnen/fix-collisionshape-add-bug

Check if shape is valid before referencing it
2015-09-23 12:46:15 -03:00 · 2015-09-23 12:46:15 -03:00 · eea52d44c7
commit eea52d44c7
parent 52ad0b0b2a 5ff0b69dae
1 changed files with 4 additions and 0 deletions
--- a/scene/2d/collision_shape_2d.cpp
+++ b/scene/2d/collision_shape_2d.cpp
@ -113,6 +113,10 @@ void CollisionShape2D::_notification(int p_what) {
 				break;
 			}

+			if (!shape.is_valid()) {
+				break;
+			}
+
 			rect=Rect2();