fix: Incorrect preprocessor clause and invalid var names. Solves .NET…

… 4.6 compiler issue. Hashcode is .NET 5 and above (fixes #261)
atteneder · Oct 27, 2021 · 25f5d2a · 25f5d2a
1 parent db431f2
commit 25f5d2a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.4.1] - 2021-10-27
+### Fixed
+- .NET 4.6 compiler issue (#261)
+
 ## [4.4.0] - 2021-10-27
 ### Added
 - Experimental glTF Editor Export (under main menu `File > Export` and via API `GLTFast.Export.GameObjectExport`; #249)

diff --git a/Runtime/Scripts/Export/Constants.cs b/Runtime/Scripts/Export/Constants.cs
@@ -17,6 +17,6 @@
 
 namespace GLTFast.Export {
     static class Constants {
-        public const string version = "4.4.0";   
+        public const string version = "4.4.1";   
     }
 }
diff --git a/Runtime/Scripts/Export/GltfWriter.cs b/Runtime/Scripts/Export/GltfWriter.cs
@@ -1206,8 +1206,8 @@ static bool Equals(int[] a, int[] b) {
             }
 
             public override int GetHashCode() {
-#if NET_4_6
-                return HashCode.Combine(meshId, materialIds);
+#if NET_STANDARD
+                return HashCode.Combine(m_MeshId, m_MaterialIds);
 #else
                 var hash = 17;
                 hash = hash * 31 + m_MeshId.GetHashCode();

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.atteneder.gltfast",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "displayName": "glTFast",
   "description": "Use glTFast to import and export glTF 3D files efficiently at runtime or in the Editor",
   "unity": "2019.4",