Merge pull request godotengine#103143 from PhairZ/plugin-icons

akien-mga · akien-mga · commit 37f9e427aad1 · 2025-02-23T12:13:06.000+01:00
Fix plugin icons not displayed
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp
@@ -1028,8 +1028,8 @@ String EditorData::script_class_get_icon_path(const String &p_class, bool *r_val
 			return String();
 		}
 		HashMap<StringName, String>::ConstIterator E = _script_class_icon_paths.find(current);
-		if ((bool)E && !E->value.is_empty()) {
-			if (r_valid) {
+		if ((bool)E) {
+			if (r_valid && !E->value.is_empty()) {
 				*r_valid = true;
 			}
 			return E->value;

Original file line number	Diff line number	Diff line change
`@@ -1028,8 +1028,8 @@ String EditorData::script_class_get_icon_path(const String &p_class, bool *r_val`
`1028`	`1028`	`return String();`
`1029`	`1029`	`}`
`1030`	`1030`	`HashMap<StringName, String>::ConstIterator E = _script_class_icon_paths.find(current);`
`1031`		`- if ((bool)E && !E->value.is_empty()) {`
`1032`		`- if (r_valid) {`
	`1031`	`+ if ((bool)E) {`
	`1032`	`+ if (r_valid && !E->value.is_empty()) {`
`1033`	`1033`	`*r_valid = true;`
`1034`	`1034`	`}`
`1035`	`1035`	`return E->value;`