summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-07-21 00:23:52 +0200
committerGitHub <noreply@github.com>2021-07-21 00:23:52 +0200
commite248d2629ab9cb1dcfa91af5202af4f17754e44f (patch)
treebaa39509f25f5faf56fe1422f744caeed9244905
parentb5e5eed7ae199a2bc5cf7fe7b08ed33b847bff25 (diff)
parente50ab50169170b21837c7f44361368a2e3c48928 (diff)
Merge pull request #50662 from SirQuartz/patch-25
Fix visual script icons
-rw-r--r--editor/property_selector.cpp3
-rw-r--r--modules/visual_script/visual_script_editor.cpp3
-rw-r--r--modules/visual_script/visual_script_property_selector.cpp12
3 files changed, 15 insertions, 3 deletions
diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp
index e4e372a19c..d26fc6ad9d 100644
--- a/editor/property_selector.cpp
+++ b/editor/property_selector.cpp
@@ -137,6 +137,7 @@ void PropertySelector::_update_search() {
search_options->get_theme_icon(SNAME("Basis"), SNAME("EditorIcons")),
search_options->get_theme_icon(SNAME("Transform3D"), SNAME("EditorIcons")),
search_options->get_theme_icon(SNAME("Color"), SNAME("EditorIcons")),
+ search_options->get_theme_icon(SNAME("StringName"), SNAME("EditorIcons")),
search_options->get_theme_icon(SNAME("NodePath"), SNAME("EditorIcons")),
search_options->get_theme_icon(SNAME("RID"), SNAME("EditorIcons")),
search_options->get_theme_icon(SNAME("MiniObject"), SNAME("EditorIcons")),
@@ -146,7 +147,9 @@ void PropertySelector::_update_search() {
search_options->get_theme_icon(SNAME("Array"), SNAME("EditorIcons")),
search_options->get_theme_icon(SNAME("PackedByteArray"), SNAME("EditorIcons")),
search_options->get_theme_icon(SNAME("PackedInt32Array"), SNAME("EditorIcons")),
+ search_options->get_theme_icon(SNAME("PackedInt64Array"), SNAME("EditorIcons")),
search_options->get_theme_icon(SNAME("PackedFloat32Array"), SNAME("EditorIcons")),
+ search_options->get_theme_icon(SNAME("PackedFloat64Array"), SNAME("EditorIcons")),
search_options->get_theme_icon(SNAME("PackedStringArray"), SNAME("EditorIcons")),
search_options->get_theme_icon(SNAME("PackedVector2Array"), SNAME("EditorIcons")),
search_options->get_theme_icon(SNAME("PackedVector3Array"), SNAME("EditorIcons")),
diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp
index b18d0fdb4b..2e0eb4757a 100644
--- a/modules/visual_script/visual_script_editor.cpp
+++ b/modules/visual_script/visual_script_editor.cpp
@@ -629,6 +629,7 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
Control::get_theme_icon(SNAME("Basis"), SNAME("EditorIcons")),
Control::get_theme_icon(SNAME("Transform3D"), SNAME("EditorIcons")),
Control::get_theme_icon(SNAME("Color"), SNAME("EditorIcons")),
+ Control::get_theme_icon(SNAME("StringName"), SNAME("EditorIcons")),
Control::get_theme_icon(SNAME("NodePath"), SNAME("EditorIcons")),
Control::get_theme_icon(SNAME("RID"), SNAME("EditorIcons")),
Control::get_theme_icon(SNAME("MiniObject"), SNAME("EditorIcons")),
@@ -638,7 +639,9 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
Control::get_theme_icon(SNAME("Array"), SNAME("EditorIcons")),
Control::get_theme_icon(SNAME("PackedByteArray"), SNAME("EditorIcons")),
Control::get_theme_icon(SNAME("PackedInt32Array"), SNAME("EditorIcons")),
+ Control::get_theme_icon(SNAME("PackedInt64Array"), SNAME("EditorIcons")),
Control::get_theme_icon(SNAME("PackedFloat32Array"), SNAME("EditorIcons")),
+ Control::get_theme_icon(SNAME("PackedFloat64Array"), SNAME("EditorIcons")),
Control::get_theme_icon(SNAME("PackedStringArray"), SNAME("EditorIcons")),
Control::get_theme_icon(SNAME("PackedVector2Array"), SNAME("EditorIcons")),
Control::get_theme_icon(SNAME("PackedVector3Array"), SNAME("EditorIcons")),
diff --git a/modules/visual_script/visual_script_property_selector.cpp b/modules/visual_script/visual_script_property_selector.cpp
index 005f54e595..ccb2e2df75 100644
--- a/modules/visual_script/visual_script_property_selector.cpp
+++ b/modules/visual_script/visual_script_property_selector.cpp
@@ -104,8 +104,11 @@ void VisualScriptPropertySelector::_update_search() {
vbc->get_theme_icon(SNAME("float"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("String"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("Vector2"), SNAME("EditorIcons")),
+ vbc->get_theme_icon(SNAME("Vector2i"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("Rect2"), SNAME("EditorIcons")),
+ vbc->get_theme_icon(SNAME("Rect2i"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("Vector3"), SNAME("EditorIcons")),
+ vbc->get_theme_icon(SNAME("Vector3i"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("Transform2D"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("Plane"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("Quaternion"), SNAME("EditorIcons")),
@@ -113,15 +116,18 @@ void VisualScriptPropertySelector::_update_search() {
vbc->get_theme_icon(SNAME("Basis"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("Transform3D"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("Color"), SNAME("EditorIcons")),
- vbc->get_theme_icon(SNAME("Path"), SNAME("EditorIcons")),
+ vbc->get_theme_icon(SNAME("StringName"), SNAME("EditorIcons")),
+ vbc->get_theme_icon(SNAME("NodePath"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("RID"), SNAME("EditorIcons")),
- vbc->get_theme_icon(SNAME("Object"), SNAME("EditorIcons")),
+ vbc->get_theme_icon(SNAME("MiniObject"), SNAME("EditorIcons")),
+ vbc->get_theme_icon(SNAME("Callable"), SNAME("EditorIcons")),
+ vbc->get_theme_icon(SNAME("Signal"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("Dictionary"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("Array"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("PackedByteArray"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("PackedInt32Array"), SNAME("EditorIcons")),
- vbc->get_theme_icon(SNAME("PackedFloat32Array"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("PackedInt64Array"), SNAME("EditorIcons")),
+ vbc->get_theme_icon(SNAME("PackedFloat32Array"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("PackedFloat64Array"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("PackedStringArray"), SNAME("EditorIcons")),
vbc->get_theme_icon(SNAME("PackedVector2Array"), SNAME("EditorIcons")),