diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-12-12 20:56:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-12 20:56:57 +0100 |
| commit | ef1d59cf1b3dd2d03ae9272550af7870e49b02ba (patch) | |
| tree | e9d3d8c8896aa8e9bd355b104f2bc90ac78b03d1 /editor/scene_tree_dock.cpp | |
| parent | dd869bd2a73cd15dfc883fbcd2336b87efde8ecf (diff) | |
| parent | 18663aa305ef1ed5c87efd74425146112322b91f (diff) | |
Merge pull request #55816 from RandomShaper/fix_revert_null_defaults
Diffstat (limited to 'editor/scene_tree_dock.cpp')
| -rw-r--r-- | editor/scene_tree_dock.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 1934850160..14c70c6c50 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -3157,8 +3157,9 @@ void SceneTreeDock::_create_remap_for_node(Node *p_node, Map<RES, RES> &r_remap) states_stack_ready = true; } - Variant orig = PropertyUtils::get_property_default_value(p_node, E.name, &states_stack); - if (!PropertyUtils::is_property_value_different(v, orig)) { + bool is_valid_default = false; + Variant orig = PropertyUtils::get_property_default_value(p_node, E.name, &is_valid_default, &states_stack); + if (is_valid_default && !PropertyUtils::is_property_value_different(v, orig)) { continue; } |