diff --git a/Source/Editor/Plugins/PluginUtils.cs b/Source/Editor/Plugins/PluginUtils.cs index 73e100b58..e6a0b9488 100644 --- a/Source/Editor/Plugins/PluginUtils.cs +++ b/Source/Editor/Plugins/PluginUtils.cs @@ -40,7 +40,6 @@ namespace FlaxEditor { // Try path relative to the plugin project Content iconPath = Path.Combine(assemblyDir, "../../../../../Content", assemblyName + ".Icon.flax"); - MessageBox.Show(StringUtils.NormalizePath(StringUtils.RemovePathRelativeParts(iconPath))); if (!File.Exists(iconPath)) { return null; diff --git a/Source/Engine/Level/Actor.cs b/Source/Engine/Level/Actor.cs index c3b13bece..7258f8514 100644 --- a/Source/Engine/Level/Actor.cs +++ b/Source/Engine/Level/Actor.cs @@ -60,7 +60,7 @@ namespace FlaxEngine /// The flag(s) to check. /// True if has flag(s) set, otherwise false. [Unmanaged] - [Tooltip("Returns true if object has given flag(s) set..")] + [Tooltip("Returns true if object has given flag(s) set.")] public bool HasStaticFlag(StaticFlags flag) { return (StaticFlags & flag) == flag; diff --git a/Source/Engine/Platform/Android/AndroidPlatformSettings.h b/Source/Engine/Platform/Android/AndroidPlatformSettings.h index 0526849a9..15959bbc5 100644 --- a/Source/Engine/Platform/Android/AndroidPlatformSettings.h +++ b/Source/Engine/Platform/Android/AndroidPlatformSettings.h @@ -29,7 +29,7 @@ public: /// /// Custom icon texture (asset id) to use for the application (overrides the default one). /// - API_FIELD(Attributes="EditorOrder(1030), AssetReference(typeof(Texture)), EditorDisplay(\"Other\")") + API_FIELD(Attributes="EditorOrder(1030), CustomEditorAlias(\"FlaxEditor.CustomEditors.Editors.AssetRefEditor\"), AssetReference(typeof(Texture)), EditorDisplay(\"Other\")") Guid OverrideIcon; public: diff --git a/Source/Engine/Profiler/Profiler.Build.cs b/Source/Engine/Profiler/Profiler.Build.cs index 9599f8572..1c7a49429 100644 --- a/Source/Engine/Profiler/Profiler.Build.cs +++ b/Source/Engine/Profiler/Profiler.Build.cs @@ -31,7 +31,7 @@ public class Profiler : EngineModule // Tracy profiling tools switch (options.Platform.Target) { - case TargetPlatform.Android: // dlopen failed: cannot locate symbol `tracy::ScopedZone::~ScopedZone()` referenced by "libFlaxGame.so" + case TargetPlatform.Android: case TargetPlatform.Linux: case TargetPlatform.Windows: options.PublicDependencies.Add("tracy"); diff --git a/Source/Engine/Scripting/Script.cpp b/Source/Engine/Scripting/Script.cpp index 6c5b4e43f..d8ba7a3e4 100644 --- a/Source/Engine/Scripting/Script.cpp +++ b/Source/Engine/Scripting/Script.cpp @@ -2,7 +2,6 @@ #include "Script.h" #include "Engine/Core/Log.h" -#include "ManagedSerialization.h" #if USE_EDITOR #include "StdTypesContainer.h" #include "ManagedCLR/MClass.h"