From 6fd1580d67f7a48f77798b34ff32b44cdbf778f4 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 16 Feb 2021 19:01:00 +0100
Subject: [PATCH] Fix building on linux after merge

---
 Source/Engine/Animations/AnimationUtils.h                 | 4 ++--
 Source/Engine/Content/Assets/VisualScript.cpp             | 2 +-
 Source/Engine/Content/Assets/VisualScript.h               | 2 +-
 Source/Engine/Graphics/Materials/MaterialShaderFeatures.h | 2 +-
 Source/Engine/Scripting/BinaryModule.cpp                  | 2 +-
 Source/Engine/Scripting/Events.h                          | 2 +-
 Source/FlaxEngine.Gen.cs                                  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/Engine/Animations/AnimationUtils.h b/Source/Engine/Animations/AnimationUtils.h
index 5df8cc2c0..11b6011e8 100644
--- a/Source/Engine/Animations/AnimationUtils.h
+++ b/Source/Engine/Animations/AnimationUtils.h
@@ -235,7 +235,7 @@ namespace AnimationUtils
     }
 
     template<>
-    static void BezierFirstDerivative<Quaternion>(const Quaternion& p0, const Quaternion& p1, const Quaternion& p2, const Quaternion& p3, float t, Quaternion& result)
+    void BezierFirstDerivative<Quaternion>(const Quaternion& p0, const Quaternion& p1, const Quaternion& p2, const Quaternion& p3, float t, Quaternion& result)
     {
         Vector3 euler;
         BezierFirstDerivative<Vector3>(p0.GetEuler(), p1.GetEuler(), p2.GetEuler(), p3.GetEuler(), t, euler);
@@ -243,7 +243,7 @@ namespace AnimationUtils
     }
 
     template<>
-    static void BezierFirstDerivative<Transform>(const Transform& p0, const Transform& p1, const Transform& p2, const Transform& p3, float t, Transform& result)
+    void BezierFirstDerivative<Transform>(const Transform& p0, const Transform& p1, const Transform& p2, const Transform& p3, float t, Transform& result)
     {
         BezierFirstDerivative<Vector3>(p0.Translation, p1.Translation, p2.Translation, p3.Translation, t, result.Translation);
         BezierFirstDerivative<Quaternion>(p0.Orientation, p1.Orientation, p2.Orientation, p3.Orientation, t, result.Orientation);
diff --git a/Source/Engine/Content/Assets/VisualScript.cpp b/Source/Engine/Content/Assets/VisualScript.cpp
index da1b97687..414d66870 100644
--- a/Source/Engine/Content/Assets/VisualScript.cpp
+++ b/Source/Engine/Content/Assets/VisualScript.cpp
@@ -1732,7 +1732,7 @@ void VisualScriptingBinaryModule::OnScriptsReloading()
 
 #endif
 
-void VisualScriptingBinaryModule::OnEvent(ScriptingObject* object, Span<Variant>& parameters, const ScriptingTypeHandle& eventType, const StringView& eventName)
+void VisualScriptingBinaryModule::OnEvent(ScriptingObject* object, Span<Variant> parameters, ScriptingTypeHandle eventType, StringView eventName)
 {
     if (object)
     {
diff --git a/Source/Engine/Content/Assets/VisualScript.h b/Source/Engine/Content/Assets/VisualScript.h
index cf8dccce3..6beeca5cc 100644
--- a/Source/Engine/Content/Assets/VisualScript.h
+++ b/Source/Engine/Content/Assets/VisualScript.h
@@ -327,7 +327,7 @@ private:
 #if USE_EDITOR
     void OnScriptsReloading();
 #endif
-    static void OnEvent(ScriptingObject* object, Span<Variant>& parameters, const ScriptingTypeHandle& eventType, const StringView& eventName);
+    static void OnEvent(ScriptingObject* object, Span<Variant> parameters, ScriptingTypeHandle eventType, StringView eventName);
 
 public:
 
diff --git a/Source/Engine/Graphics/Materials/MaterialShaderFeatures.h b/Source/Engine/Graphics/Materials/MaterialShaderFeatures.h
index a70d9ada8..3eb1db89d 100644
--- a/Source/Engine/Graphics/Materials/MaterialShaderFeatures.h
+++ b/Source/Engine/Graphics/Materials/MaterialShaderFeatures.h
@@ -13,7 +13,7 @@ struct MaterialShaderFeature
     {
         const Char* Template;
     };
-#endif;
+#endif
 };
 
 // Material shader feature that add support for Forward shading inside the material shader.
diff --git a/Source/Engine/Scripting/BinaryModule.cpp b/Source/Engine/Scripting/BinaryModule.cpp
index d5df8947e..8a92f5f2d 100644
--- a/Source/Engine/Scripting/BinaryModule.cpp
+++ b/Source/Engine/Scripting/BinaryModule.cpp
@@ -17,7 +17,7 @@
 #include "Events.h"
 
 Dictionary<Pair<ScriptingTypeHandle, StringView>, void(*)(ScriptingObject*, void*, bool)> ScriptingEvents::EventsTable;
-Delegate<ScriptingObject*, Span<Variant>&, const ScriptingTypeHandle&, const StringView&> ScriptingEvents::Event;
+Delegate<ScriptingObject*, Span<Variant>, ScriptingTypeHandle, StringView> ScriptingEvents::Event;
 
 ManagedBinaryModule* GetBinaryModuleCorlib()
 {
diff --git a/Source/Engine/Scripting/Events.h b/Source/Engine/Scripting/Events.h
index 11f1643ee..ce7111c84 100644
--- a/Source/Engine/Scripting/Events.h
+++ b/Source/Engine/Scripting/Events.h
@@ -32,5 +32,5 @@ public:
     /// <remarks>
     /// Delegate parameters: event caller instance (null for static events), event invocation parameters list, event type name (full), event name.
     /// </remarks>
-    static Delegate<ScriptingObject*, Span<Variant>&, const ScriptingTypeHandle&, const StringView&> Event;
+    static Delegate<ScriptingObject*, Span<Variant>, ScriptingTypeHandle, StringView> Event;
 };
diff --git a/Source/FlaxEngine.Gen.cs b/Source/FlaxEngine.Gen.cs
index 04aef0556..3a9feca06 100644
--- a/Source/FlaxEngine.Gen.cs
+++ b/Source/FlaxEngine.Gen.cs
@@ -12,6 +12,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: Guid("095aaaed-cc57-6182-57cc-82617b3c2889")]
+[assembly: Guid("b8442186-4a70-7c85-704a-857c262d00f6")]
 [assembly: AssemblyVersion("1.0.6216")]
 [assembly: AssemblyFileVersion("1.0.6216")]