From beae9b0bc161cb251d9be73077bd50d03ab67838 Mon Sep 17 00:00:00 2001 From: MewPurPur Date: Tue, 13 Jun 2023 11:35:35 +0200 Subject: [PATCH] Fix Curve Editor crash with null curve --- editor/plugins/curve_editor_plugin.cpp | 8 +++++--- editor/plugins/gradient_texture_2d_editor_plugin.cpp | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index eeb8e998b9c..a1a692bdd1f 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/plugins/curve_editor_plugin.cpp @@ -978,9 +978,11 @@ void CurveEditor::_notification(int p_what) { } break; case NOTIFICATION_READY: { Ref curve = curve_editor_rect->get_curve(); - // Set snapping settings based on the curve's meta. - snap_button->set_pressed(curve->get_meta("_snap_enabled", false)); - snap_count_edit->set_value(curve->get_meta("_snap_count", DEFAULT_SNAP)); + if (curve.is_valid()) { + // Set snapping settings based on the curve's meta. + snap_button->set_pressed(curve->get_meta("_snap_enabled", false)); + snap_count_edit->set_value(curve->get_meta("_snap_count", DEFAULT_SNAP)); + } } break; } } diff --git a/editor/plugins/gradient_texture_2d_editor_plugin.cpp b/editor/plugins/gradient_texture_2d_editor_plugin.cpp index dd91b1356dd..08de48af181 100644 --- a/editor/plugins/gradient_texture_2d_editor_plugin.cpp +++ b/editor/plugins/gradient_texture_2d_editor_plugin.cpp @@ -265,9 +265,11 @@ void GradientTexture2DEditor::_notification(int p_what) { snap_button->set_icon(get_theme_icon(SNAME("SnapGrid"), SNAME("EditorIcons"))); } break; case NOTIFICATION_READY: { - // Set snapping settings based on the texture's meta. - snap_button->set_pressed(texture->get_meta("_snap_enabled", false)); - snap_count_edit->set_value(texture->get_meta("_snap_count", DEFAULT_SNAP)); + if (texture.is_valid()) { + // Set snapping settings based on the texture's meta. + snap_button->set_pressed(texture->get_meta("_snap_enabled", false)); + snap_count_edit->set_value(texture->get_meta("_snap_count", DEFAULT_SNAP)); + } } break; } }