Merge branch 'CleanUp'

maikramer · Feb 2, 2019 · 3a7cd14 · 3a7cd14
2 parents 7bba87c + 46f4394
commit 3a7cd14
Show file tree

Hide file tree

Showing 77 changed files with 10,935 additions and 12,966 deletions.
diff --git a/.idea/.idea.Materialize/.idea/contentModel.xml b/.idea/.idea.Materialize/.idea/contentModel.xml
diff --git a/.idea/.idea.Materialize/.idea/dictionaries/maikeu.xml b/.idea/.idea.Materialize/.idea/dictionaries/maikeu.xml
diff --git a/.idea/.idea.Materialize/.idea/workspace.xml b/.idea/.idea.Materialize/.idea/workspace.xml
diff --git a/Assembly-CSharp.csproj.DotSettings b/Assembly-CSharp.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cscripts_005Cresources/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Assets/MainScene.unity b/Assets/MainScene.unity
diff --git a/Assets/Materials/AO_Preview.mat b/Assets/Materials/AO_Preview.mat
diff --git a/Assets/Materials/Alignment_Material.mat b/Assets/Materials/Alignment_Material.mat
diff --git a/Assets/Materials/Edge_Preview.mat b/Assets/Materials/Edge_Preview.mat
diff --git a/Assets/Materials/Height_Preview.mat b/Assets/Materials/Height_Preview.mat
diff --git a/Assets/Materials/Metallic_Preview.mat b/Assets/Materials/Metallic_Preview.mat
diff --git a/Assets/Materials/Normal_Preview.mat b/Assets/Materials/Normal_Preview.mat
diff --git a/Assets/Materials/Skybox.mat b/Assets/Materials/Skybox.mat
diff --git a/Assets/Materials/Smoothness_Preview.mat b/Assets/Materials/Smoothness_Preview.mat
diff --git a/Assets/OBJ-IO/Plugins/Mesh/OBJ/OBJFaceVertex.cs b/Assets/OBJ-IO/Plugins/Mesh/OBJ/OBJFaceVertex.cs
@@ -1,5 +1,4 @@
-
-public class OBJFaceVertex
+public class OBJFaceVertex
 {
     //------------------------------------------------------------------------------------------------------------
     public int m_VertexIndex = -1;
@@ -15,11 +14,10 @@ public override int GetHashCode()
 
     public override bool Equals(object obj)
     {
-        OBJFaceVertex faceVertex = (OBJFaceVertex)obj;
+        OBJFaceVertex faceVertex = (OBJFaceVertex) obj;
         return m_VertexIndex == faceVertex.m_VertexIndex
-            && m_UVIndex == faceVertex.m_UVIndex
-            && m_UV2Index == faceVertex.m_UV2Index
-            && m_NormalIndex == faceVertex.m_NormalIndex
-            && m_ColorIndex == m_ColorIndex;
+               && m_UVIndex == faceVertex.m_UVIndex
+               && m_UV2Index == faceVertex.m_UV2Index
+               && m_NormalIndex == faceVertex.m_NormalIndex;
     }
 }
diff --git a/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll b/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll
diff --git a/Assets/PostProcess/OpaquePostProcess.cs b/Assets/PostProcess/OpaquePostProcess.cs
@@ -19,10 +19,6 @@ public class OpaquePostProcess : MonoBehaviour {
 	RenderTexture _AccumulatedFramesAlt;
 
 	Camera thisCamera;
-	Quaternion lastCamRotation = Quaternion.identity;
-	Vector3 lastCamPosition = Vector3.zero;
-	Quaternion savedCameraRotation = Quaternion.identity;
-	float lastBlendAmount = 1.0f;
 
 	HaltonSequence positionsequence = new HaltonSequence();
 	int hspos = 0;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
		<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cscripts_005Cresources/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>