diff --git a/Assets/VRM/UniGLTF/Resources/Shaders/StandardVColor.shader b/Assets/VRM/UniGLTF/Resources/Shaders/StandardVColor.shader index 32de7ddb1..2cf04f963 100644 --- a/Assets/VRM/UniGLTF/Resources/Shaders/StandardVColor.shader +++ b/Assets/VRM/UniGLTF/Resources/Shaders/StandardVColor.shader @@ -1,4 +1,6 @@ -Shader "UniGLTF/StandardVColor" { +// Upgrade NOTE: upgraded instancing buffer 'Props' to new syntax. + +Shader "UniGLTF/StandardVColor" { Properties { _Color ("Color", Color) = (1,1,1,1) _MainTex ("Albedo (RGB)", 2D) = "white" {} @@ -30,9 +32,9 @@ // Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader. // See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing. // #pragma instancing_options assumeuniformscaling - UNITY_INSTANCING_CBUFFER_START(Props) + UNITY_INSTANCING_BUFFER_START(Props) // put more per-instance properties here - UNITY_INSTANCING_CBUFFER_END + UNITY_INSTANCING_BUFFER_END(Props) void vert(inout appdata_full v, out Input o){ UNITY_INITIALIZE_OUTPUT(Input, o); diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset new file mode 100644 index 000000000..df73dc414 Binary files /dev/null and b/ProjectSettings/PresetManager.asset differ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 7a59bc879..886d7e558 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 5.6.7f1 +m_EditorVersion: 2018.4.23f1 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 000000000..3749cda6e Binary files /dev/null and b/ProjectSettings/VFXManager.asset differ