diff options
Diffstat (limited to 'editor/property_selector.cpp')
| -rw-r--r-- | editor/property_selector.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp index 426ec51e4c..1de5099c4a 100644 --- a/editor/property_selector.cpp +++ b/editor/property_selector.cpp @@ -120,7 +120,7 @@ void PropertySelector::_update_search() { bool found = false; - Ref<Texture> type_icons[Variant::VARIANT_MAX] = { + Ref<Texture2D> type_icons[Variant::VARIANT_MAX] = { Control::get_icon("Variant", "EditorIcons"), Control::get_icon("bool", "EditorIcons"), Control::get_icon("int", "EditorIcons"), @@ -159,7 +159,7 @@ void PropertySelector::_update_search() { category->set_text(0, E->get().name); category->set_selectable(0, false); - Ref<Texture> icon; + Ref<Texture2D> icon; if (E->get().name == "Script Variables") { icon = get_icon("Script", "EditorIcons"); } else { @@ -234,7 +234,7 @@ void PropertySelector::_update_search() { category->set_text(0, E->get().name.replace_first("*", "")); category->set_selectable(0, false); - Ref<Texture> icon; + Ref<Texture2D> icon; script_methods = false; String rep = E->get().name.replace("*", ""); if (E->get().name == "*Script Methods") { @@ -404,7 +404,7 @@ void PropertySelector::select_method_from_base_type(const String &p_base, const base_type = p_base; selected = p_current; type = Variant::NIL; - script = 0; + script = ObjectID(); properties = false; instance = NULL; virtuals_only = p_virtuals_only; @@ -437,7 +437,7 @@ void PropertySelector::select_method_from_basic_type(Variant::Type p_type, const base_type = ""; selected = p_current; type = p_type; - script = 0; + script = ObjectID(); properties = false; instance = NULL; virtuals_only = false; @@ -453,7 +453,7 @@ void PropertySelector::select_method_from_instance(Object *p_instance, const Str base_type = p_instance->get_class(); selected = p_current; type = Variant::NIL; - script = 0; + script = ObjectID(); { Ref<Script> scr = p_instance->get_script(); if (scr.is_valid()) @@ -474,7 +474,7 @@ void PropertySelector::select_property_from_base_type(const String &p_base, cons base_type = p_base; selected = p_current; type = Variant::NIL; - script = 0; + script = ObjectID(); properties = true; instance = NULL; virtuals_only = false; @@ -509,7 +509,7 @@ void PropertySelector::select_property_from_basic_type(Variant::Type p_type, con base_type = ""; selected = p_current; type = p_type; - script = 0; + script = ObjectID(); properties = true; instance = NULL; virtuals_only = false; @@ -525,7 +525,7 @@ void PropertySelector::select_property_from_instance(Object *p_instance, const S base_type = ""; selected = p_current; type = Variant::NIL; - script = 0; + script = ObjectID(); properties = true; instance = p_instance; virtuals_only = false; |