Temp FIN

Assets/PotaToon/Editor/PotaToon.Editor.asmdef.meta

@@ -9,6 +9,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/PotaToon.Editor.asmdef
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Material/Eye/Eye.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Material/Eye/Eye.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Material/Face/Eyeball.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Material/Face/Eyeball.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Material/Face/Face.asset

@@ -20,14 +20,13 @@ MonoBehaviour:
   _Cutoff: 0.5
   _ZWriteMode: 1
   _AutoRenderQueue: 1
-  _RenderQueue: 2000
   _StencilComp: 0
   _StencilRef: 0
   _StencilPass: 0
   _StencilFail: 0
   _StencilZFail: 0
   _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-  _ShadeColor: {r: 1, g: 0.8627451, b: 0.8627451, a: 1}
+  _ShadeColor: {r: 1, g: 0.68396217, b: 0.68396217, a: 1}
   _BaseStep: 0.5
   _StepSmoothness: 0.01
   _UseMidTone: 1

Assets/PotaToon/Editor/Presets/Material/Face/Face.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Material/Face/Face.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Material/Face/Face_Inner.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Material/Face/Face_Inner.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Material/General/Cloth.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Material/General/Cloth.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Material/General/Cloth_Transparent.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Material/General/Cloth_Transparent.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Material/General/Crystal.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Material/General/Crystal.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Material/General/Glass.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Material/General/Glass.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Material/General/Gold.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Material/General/Gold.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Material/General/Hair.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Material/General/Hair.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Material/General/RimShade.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Material/General/RimShade.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Material/General/Skin.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Material/General/Skin.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Volume/1_Default.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Volume/1_Default.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Volume/2_Normal.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Volume/2_Normal.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Volume/3_Normal2.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Volume/3_Normal2.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Volume/4_Concert.asset

@@ -14,18 +14,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   mode: 1
   transparentShadow: 0
-  charShadowDirOffsetMode: 0
   charShadowDirOffset: {x: 0, y: 0, z: 0}
   followLayerMask:
     serializedVersion: 2
-    m_Bits: 126455
+    m_Bits: 4294967295
   maxToonBrightness: 1.25
   bias: 1
   normalBias: 0.1
   quality: 2
   textureScale: 8
   transparentTextureScale: 8
-  shadowCullingDistance: 1.5
   oit: 0
   oitMode: 0
   charPostProcessing: 1
@@ -41,31 +39,11 @@ MonoBehaviour:
   charColorFilter: {r: 1, g: 1, b: 1, a: 1}
   charHueShift: 0
   charSaturation: 0
-  whiteBalanceTemperature: 0
-  whiteBalanceTint: 0
   screenRimWidth: 0.25
   screenRimColor: {r: 1, g: 1, b: 1, a: 1}
   envPostProcessing: 0
   envToneMapping: 0
   envPostExposure: 1
-  envContrast: 0
-  envColorFilter: {r: 1, g: 1, b: 1, a: 1}
-  envHueShift: 0
-  envSaturation: 0
-  envWhiteBalanceTemperature: 0
-  envWhiteBalanceTint: 0
-  charToeStrength: 0
-  charToeLength: 0.5
-  charShoulderStrength: 0
-  charShoulderLength: 0.5
-  charShoulderAngle: 0
-  charGamma: 1
-  envToeStrength: 0
-  envToeLength: 0.5
-  envShoulderStrength: 0
-  envShoulderLength: 0.5
-  envShoulderAngle: 0
-  envGamma: 1
   charBloom: 1
   threshold: 1.1
   intensity: 3
@@ -77,14 +55,3 @@ MonoBehaviour:
   maxIterations: 6
   dirtTexture: {fileID: 0}
   dirtIntensity: 0
-  envBloom: 0
-  envBloomThreshold: 0.9
-  envBloomIntensity: 0
-  envBloomScatter: 0.7
-  envBloomClamp: 65472
-  envBloomTint: {r: 1, g: 1, b: 1, a: 1}
-  envBloomHighQualityFiltering: 0
-  envBloomDownscale: 0
-  envBloomMaxIterations: 6
-  envBloomDirtTexture: {fileID: 0}
-  envBloomDirtIntensity: 0

Assets/PotaToon/Editor/Presets/Volume/4_Concert.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Volume/4_Concert.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Volume/5_Concert2.asset

@@ -14,18 +14,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   mode: 1
   transparentShadow: 0
-  charShadowDirOffsetMode: 0
   charShadowDirOffset: {x: 0, y: 0, z: 0}
   followLayerMask:
     serializedVersion: 2
-    m_Bits: 126455
+    m_Bits: 4294967295
   maxToonBrightness: 1.25
   bias: 1
   normalBias: 0.1
   quality: 2
   textureScale: 8
   transparentTextureScale: 8
-  shadowCullingDistance: 1.5
   oit: 0
   oitMode: 0
   charPostProcessing: 1
@@ -41,31 +39,11 @@ MonoBehaviour:
   charColorFilter: {r: 1, g: 1, b: 1, a: 1}
   charHueShift: 0
   charSaturation: 0
-  whiteBalanceTemperature: 0
-  whiteBalanceTint: 0
   screenRimWidth: 0.25
   screenRimColor: {r: 1, g: 1, b: 1, a: 1}
   envPostProcessing: 0
   envToneMapping: 0
   envPostExposure: 1
-  envContrast: 0
-  envColorFilter: {r: 1, g: 1, b: 1, a: 1}
-  envHueShift: 0
-  envSaturation: 0
-  envWhiteBalanceTemperature: 0
-  envWhiteBalanceTint: 0
-  charToeStrength: 0
-  charToeLength: 0.5
-  charShoulderStrength: 0
-  charShoulderLength: 0.5
-  charShoulderAngle: 0
-  charGamma: 1
-  envToeStrength: 0
-  envToeLength: 0.5
-  envShoulderStrength: 0
-  envShoulderLength: 0.5
-  envShoulderAngle: 0
-  envGamma: 1
   charBloom: 1
   threshold: 1.1
   intensity: 3
@@ -77,14 +55,3 @@ MonoBehaviour:
   maxIterations: 6
   dirtTexture: {fileID: 0}
   dirtIntensity: 0
-  envBloom: 0
-  envBloomThreshold: 0.9
-  envBloomIntensity: 0
-  envBloomScatter: 0.7
-  envBloomClamp: 65472
-  envBloomTint: {r: 1, g: 1, b: 1, a: 1}
-  envBloomHighQualityFiltering: 0
-  envBloomDownscale: 0
-  envBloomMaxIterations: 6
-  envBloomDirtTexture: {fileID: 0}
-  envBloomDirtIntensity: 0

Assets/PotaToon/Editor/Presets/Volume/5_Concert2.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Volume/5_Concert2.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Presets/Volume/6_ShinyRim.asset.meta

@@ -10,6 +10,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Presets/Volume/6_ShinyRim.asset
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Scripts/PotaToonCharacterEditor.cs

@@ -71,6 +71,7 @@ namespace PotaToon.Editor
             if (character.useDitherFade)
             {
                 EditorGUI.indentLevel++;
+                Undo.RecordObject(character, "Update Dither fade property");
                 character.ditherFadeMinZ = Mathf.Max(0.01f, EditorGUILayout.FloatField(new GUIContent("Min Z", "Sets the nearest distance where dither fade peaks. Commonly the same as the camera near-clip."), character.ditherFadeMinZ));
                 character.ditherFadeMaxZ = Mathf.Max(0.01f, EditorGUILayout.FloatField(new GUIContent("Max Z", "Sets the distance at which dither fade starts."), character.ditherFadeMaxZ));
                 EditorGUI.indentLevel--;

Assets/PotaToon/Editor/Scripts/PotaToonCharacterEditor.cs.meta

@@ -4,6 +4,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Scripts/PotaToonCharacterEditor.cs
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Scripts/PotaToonEditor.cs.meta

@@ -13,6 +13,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Scripts/PotaToonEditor.cs
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Scripts/PotaToonEditorUtility.cs

@@ -501,6 +501,13 @@ namespace PotaToon.Editor
             {
                 copy.SetInt("_AutoRenderQueue", 0);
             }
+
+            if (copy.renderQueue < 2450)
+                copy.SetInt("_SurfaceType", (int)SurfaceType.Opaque);
+            else if (copy.renderQueue < 2501)
+                copy.SetInt("_SurfaceType", (int)SurfaceType.Cutout);
+            else
+                copy.SetInt("_SurfaceType", (int)SurfaceType.Transparent);
         }
         
         private static void CopyNumericData(Material original, Material copy)

Assets/PotaToon/Editor/Scripts/PotaToonEditorUtility.cs.meta

@@ -13,6 +13,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Scripts/PotaToonEditorUtility.cs
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Scripts/PotaToonEyeMaterialPreset.cs.meta

@@ -13,6 +13,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Scripts/PotaToonEyeMaterialPreset.cs
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Scripts/PotaToonEyeShaderGUI.cs.meta

@@ -4,6 +4,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Scripts/PotaToonEyeShaderGUI.cs
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Scripts/PotaToonGUIUtility.cs

@@ -6,7 +6,7 @@ namespace PotaToon.Editor
 {
     internal static class PotaToonGUIUtility
     {
-        internal const string k_Version = "1.3.6";
+        internal const string k_Version = "1.3.7";
         internal static readonly string[] k_Types = new string[] { "General", "Face", "Eye" };
         internal static readonly string[] k_Paths = new string[] { "PotaToon/Toon", "PotaToon/Toon", "PotaToon/Eye" };
         

Assets/PotaToon/Editor/Scripts/PotaToonGUIUtility.cs.meta

@@ -5,6 +5,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Scripts/PotaToonGUIUtility.cs
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Scripts/PotaToonMaterialFinderWindow.cs.meta

@@ -13,6 +13,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Scripts/PotaToonMaterialFinderWindow.cs
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Scripts/PotaToonMaterialPreset.cs.meta

@@ -13,6 +13,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Scripts/PotaToonMaterialPreset.cs
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Scripts/PotaToonMeshBoundsUtils.cs.meta

@@ -4,6 +4,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Scripts/PotaToonMeshBoundsUtils.cs
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Scripts/PotaToonShaderGUI.cs

@@ -358,8 +358,13 @@ namespace PotaToon.Editor
             PropertyGroupBox("Normal Map", (Property) =>
             {
                 Property("Use Normal Map", (s) => materialEditor.ShaderProperty(_UseNormalMap, new GUIContent(s)));
+                EditorGUI.BeginDisabledGroup(material.GetInt("_UseNormalMap") == 0);
                 Property("Normal Map", (s) => materialEditor.TexturePropertySingleLine(new GUIContent(s), _NormalMap, _NormalMapUV));
+                EditorGUI.indentLevel++;
+                Property("Normal Map", (s) => materialEditor.TextureScaleOffsetProperty(_NormalMap));
+                EditorGUI.indentLevel--;
                 Property("Bump Scale", (s) => materialEditor.RangeProperty(_BumpScale, s));
+                EditorGUI.EndDisabledGroup();
             });
 
             PropertyGroupBox("Rim Light", (Property) =>

Assets/PotaToon/Editor/Scripts/PotaToonShaderGUI.cs.meta

@@ -13,6 +13,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Scripts/PotaToonShaderGUI.cs
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Scripts/PotaToonShaderGUIBase.cs.meta

@@ -13,6 +13,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Scripts/PotaToonShaderGUIBase.cs
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Scripts/PotaToonShaderGUISearchHelper.cs.meta

@@ -13,6 +13,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Scripts/PotaToonShaderGUISearchHelper.cs
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Scripts/PotaToonVolumePreset.cs.meta

@@ -13,6 +13,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Scripts/PotaToonVolumePreset.cs
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Shaders/CustomTonemapperCurve.shader.meta

@@ -11,6 +11,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Shaders/CustomTonemapperCurve.shader
-  uploadId: 814994
+  uploadId: 827176

Assets/PotaToon/Editor/Textures/potatoon_icon.png.meta

@@ -132,6 +132,6 @@ AssetOrigin:
   serializedVersion: 1
   productId: 316069
   packageName: PotaToon
-  packageVersion: 1.3.6
+  packageVersion: 1.3.7
   assetPath: Assets/PotaToon/Editor/Textures/potatoon_icon.png
-  uploadId: 814994
+  uploadId: 827176