Temp FIN
This commit is contained in:
@@ -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--;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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" };
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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) =>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user