diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-20 22:01:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 22:01:37 +0100 |
| commit | d681d99e126bcac87823510ba2a71af0ace6e8dc (patch) | |
| tree | a9f5eaf4ecf107dff251486b207fd732776b2a8c /editor | |
| parent | 04d283dc230e20f0e744768aa7645f414a8e88b6 (diff) | |
| parent | 7b0ed2aa5e4b9d9807037d57f0fc80fe8dd6fb39 (diff) | |
Merge pull request #52134 from RandomShaper/fix_naming
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/debugger/script_editor_debugger.cpp | 4 | ||||
| -rw-r--r-- | editor/inspector_dock.cpp | 4 | ||||
| -rw-r--r-- | editor/scene_tree_dock.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index 4349ffc75b..ee844fff64 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -1121,7 +1121,7 @@ void ScriptEditorDebugger::_property_changed(Object *p_base, const StringName &p NodePath path = editor->get_edited_scene()->get_path_to(node); int pathid = _get_node_path_cache(path); - if (p_value.is_ref()) { + if (p_value.is_ref_counted()) { Ref<Resource> res = p_value; if (res.is_valid() && !res->get_path().is_empty()) { Array msg; @@ -1147,7 +1147,7 @@ void ScriptEditorDebugger::_property_changed(Object *p_base, const StringName &p String respath = res->get_path(); int pathid = _get_res_path_cache(respath); - if (p_value.is_ref()) { + if (p_value.is_ref_counted()) { Ref<Resource> res2 = p_value; if (res2.is_valid() && !res2->get_path().is_empty()) { Array msg; diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp index ce4e51e54c..df9dca10b2 100644 --- a/editor/inspector_dock.cpp +++ b/editor/inspector_dock.cpp @@ -108,7 +108,7 @@ void InspectorDock::_menu_option_confirm(int p_option, bool p_confirmed) { Variant v = current->get(E->get().name); REF ref = v; RES res = ref; - if (v.is_ref() && ref.is_valid() && res.is_valid()) { + if (v.is_ref_counted() && ref.is_valid() && res.is_valid()) { // Valid resource which would be duplicated if action is confirmed. resource_propnames.append(E->get().name); } @@ -145,7 +145,7 @@ void InspectorDock::_menu_option_confirm(int p_option, bool p_confirmed) { } Variant v = current->get(prop_info.name); - if (v.is_ref()) { + if (v.is_ref_counted()) { REF ref = v; if (ref.is_valid()) { RES res = ref; diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 3dbbb30b0e..9290fe0ff7 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -3214,7 +3214,7 @@ void SceneTreeDock::_create_remap_for_node(Node *p_node, Map<RES, RES> &r_remap) } Variant v = p_node->get(E.name); - if (v.is_ref()) { + if (v.is_ref_counted()) { RES res = v; if (res.is_valid()) { if (!states_stack_ready) { @@ -3252,7 +3252,7 @@ void SceneTreeDock::_create_remap_for_resource(RES p_resource, Map<RES, RES> &r_ } Variant v = p_resource->get(E.name); - if (v.is_ref()) { + if (v.is_ref_counted()) { RES res = v; if (res.is_valid()) { if (res->is_built_in() && !r_remap.has(res)) { |