Add several missing Null checks in _notification

This fixes #6118

Add several missing Null checks in _notification
9a1d9a41 · Hein-Pieter van Braam · 53c00109 · 9a1d9a41 · 9a1d9a41
Commit 9a1d9a41 authored Aug 26, 2017 by Hein-Pieter van Braam
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

collision_polygon_editor_plugin.cpp editor/plugins/collision_polygon_editor_plugin.cpp +3 -0

grid_map_editor_plugin.cpp modules/gridmap/grid_map_editor_plugin.cpp +3 -0

No files found.
--- a/editor/plugins/collision_polygon_editor_plugin.cpp
+++ b/editor/plugins/collision_polygon_editor_plugin.cpp
@@ -48,6 +48,9 @@ void CollisionPolygonEditor::_notification(int p_what) {

 		} break;
 		case NOTIFICATION_PROCESS: {
+			if (!node) {
+				return;
+			}

 			if (node->get_depth() != prev_depth) {
 				_polygon_draw();

--- a/modules/gridmap/grid_map_editor_plugin.cpp
+++ b/modules/gridmap/grid_map_editor_plugin.cpp
@@ -835,6 +835,9 @@ void GridMapEditor::_notification(int p_what) {
 		duplicate_instance = RID();

 	} else if (p_what == NOTIFICATION_PROCESS) {
+		if (!node) {
+			return;
+		}

 		Transform xf = node->get_global_transform();