|
@@ -136,7 +136,7 @@ void CanvasLayer::_notification(int p_what) {
|
|
} else {
|
|
} else {
|
|
vp = Node::get_viewport();
|
|
vp = Node::get_viewport();
|
|
}
|
|
}
|
|
- ERR_FAIL_COND(!vp);
|
|
|
|
|
|
+ ERR_FAIL_NULL_MSG(vp, "Viewport is not initialized.");
|
|
|
|
|
|
vp->_canvas_layer_add(this);
|
|
vp->_canvas_layer_add(this);
|
|
viewport = vp->get_viewport_rid();
|
|
viewport = vp->get_viewport_rid();
|
|
@@ -148,6 +148,8 @@ void CanvasLayer::_notification(int p_what) {
|
|
|
|
|
|
} break;
|
|
} break;
|
|
case NOTIFICATION_EXIT_TREE: {
|
|
case NOTIFICATION_EXIT_TREE: {
|
|
|
|
+ ERR_FAIL_NULL_MSG(vp, "Viewport is not initialized.");
|
|
|
|
+
|
|
vp->_canvas_layer_remove(this);
|
|
vp->_canvas_layer_remove(this);
|
|
VisualServer::get_singleton()->viewport_remove_canvas(viewport, canvas);
|
|
VisualServer::get_singleton()->viewport_remove_canvas(viewport, canvas);
|
|
viewport = RID();
|
|
viewport = RID();
|
|
@@ -168,6 +170,8 @@ Size2 CanvasLayer::get_viewport_size() const {
|
|
return Size2(1, 1);
|
|
return Size2(1, 1);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ ERR_FAIL_NULL_V_MSG(vp, Size2(1, 1), "Viewport is not initialized.");
|
|
|
|
+
|
|
Rect2 r = vp->get_visible_rect();
|
|
Rect2 r = vp->get_visible_rect();
|
|
return r.size;
|
|
return r.size;
|
|
}
|
|
}
|
|
@@ -177,7 +181,7 @@ RID CanvasLayer::get_viewport() const {
|
|
}
|
|
}
|
|
|
|
|
|
void CanvasLayer::set_custom_viewport(Node *p_viewport) {
|
|
void CanvasLayer::set_custom_viewport(Node *p_viewport) {
|
|
- ERR_FAIL_NULL(p_viewport);
|
|
|
|
|
|
+ ERR_FAIL_NULL_MSG(p_viewport, "Cannot set viewport to nullptr.");
|
|
if (is_inside_tree()) {
|
|
if (is_inside_tree()) {
|
|
vp->_canvas_layer_remove(this);
|
|
vp->_canvas_layer_remove(this);
|
|
VisualServer::get_singleton()->viewport_remove_canvas(viewport, canvas);
|
|
VisualServer::get_singleton()->viewport_remove_canvas(viewport, canvas);
|