diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-11-06 14:24:38 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 14:24:38 -0300 |
| commit | 207f8c08b3f161ea0e84c3f51d4c86662633b5c9 (patch) | |
| tree | 1eb1930e9124c5ecf77840e80ebed64cbb85608c /editor/plugins | |
| parent | 391d29f558d122798416b5957660d9eeceecd0f5 (diff) | |
| parent | f2397809a84c2bf0d41e6cb2092fa8f3c5a17850 (diff) | |
Merge pull request #43323 from reduz/variant-bind-rework2
Refactored Variant Operators.
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/node_3d_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/texture_region_editor_plugin.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 7002ffa109..1abbd95af8 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -4687,7 +4687,7 @@ void Node3DEditor::set_state(const Dictionary &p_state) { } int state = EditorNode3DGizmoPlugin::VISIBLE; for (int i = 0; i < keys.size(); i++) { - if (gizmo_plugins_by_name.write[j]->get_name() == keys[i]) { + if (gizmo_plugins_by_name.write[j]->get_name() == String(keys[i])) { state = gizmos_status[keys[i]]; break; } diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index be8ddf789b..ea1941c931 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -2397,7 +2397,7 @@ void ScriptEditor::_editor_settings_changed() { if (current_theme == "") { current_theme = EditorSettings::get_singleton()->get("text_editor/theme/color_theme"); - } else if (current_theme != EditorSettings::get_singleton()->get("text_editor/theme/color_theme")) { + } else if (current_theme != String(EditorSettings::get_singleton()->get("text_editor/theme/color_theme"))) { current_theme = EditorSettings::get_singleton()->get("text_editor/theme/color_theme"); EditorSettings::get_singleton()->load_text_editor_theme(); } diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index 6e722607f7..f599b94428 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -875,7 +875,8 @@ void TextureRegionEditor::_changed_callback(Object *p_changed, const char *p_pro if (!is_visible()) { return; } - if (p_prop == StringName("atlas") || p_prop == StringName("texture") || p_prop == StringName("region")) { + String prop = p_prop; + if (prop == "atlas" || prop == "texture" || prop == "region") { _edit_region(); } } |