GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor tweaks

Browse Source
This commit is contained in:
Wojtek Figat
2021-07-21 15:42:04 +02:00
parent d26eabe2bf
commit b7a7bc891a
5 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Editor/Plugins/PluginUtils.cs
View File

@@ -40,7 +40,6 @@ namespace FlaxEditor
{ {
// Try path relative to the plugin project Content // Try path relative to the plugin project Content
iconPath = Path.Combine(assemblyDir, "../../../../../Content", assemblyName + ".Icon.flax"); iconPath = Path.Combine(assemblyDir, "../../../../../Content", assemblyName + ".Icon.flax");
MessageBox.Show(StringUtils.NormalizePath(StringUtils.RemovePathRelativeParts(iconPath)));
if (!File.Exists(iconPath)) if (!File.Exists(iconPath))
{ {
return null; return null;

2
Source/Engine/Level/Actor.cs
View File

@@ -60,7 +60,7 @@ namespace FlaxEngine
/// <param name="flag">The flag(s) to check.</param> /// <param name="flag">The flag(s) to check.</param>
/// <returns>True if has flag(s) set, otherwise false.</returns> /// <returns>True if has flag(s) set, otherwise false.</returns>
[Unmanaged] [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) public bool HasStaticFlag(StaticFlags flag)
{ {
return (StaticFlags & flag) == flag; return (StaticFlags & flag) == flag;

2
Source/Engine/Platform/Android/AndroidPlatformSettings.h
View File

@@ -29,7 +29,7 @@ public:
/// <summary> /// <summary>
/// Custom icon texture (asset id) to use for the application (overrides the default one). /// Custom icon texture (asset id) to use for the application (overrides the default one).
/// </summary> /// </summary>
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; Guid OverrideIcon;
public: public:

2
Source/Engine/Profiler/Profiler.Build.cs
View File

@@ -31,7 +31,7 @@ public class Profiler : EngineModule
// Tracy profiling tools // Tracy profiling tools
switch (options.Platform.Target) 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.Linux:
case TargetPlatform.Windows: case TargetPlatform.Windows:
options.PublicDependencies.Add("tracy"); options.PublicDependencies.Add("tracy");

1
Source/Engine/Scripting/Script.cpp
View File

@@ -2,7 +2,6 @@
#include "Script.h" #include "Script.h"
#include "Engine/Core/Log.h" #include "Engine/Core/Log.h"
#include "ManagedSerialization.h"
#if USE_EDITOR #if USE_EDITOR
#include "StdTypesContainer.h" #include "StdTypesContainer.h"
#include "ManagedCLR/MClass.h" #include "ManagedCLR/MClass.h"