From 90a19c0fa395fd23d95aca5d71b4ba9a6c84f5f9 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 1 Jun 2020 19:32:55 +0900 Subject: [PATCH] Update Unity version from 5.6.7f1 to 2018.4.23f1 --- .../Resources/Shaders/StandardVColor.shader | 8 +++++--- ProjectSettings/PresetManager.asset | Bin 0 -> 4104 bytes ProjectSettings/ProjectVersion.txt | 2 +- ProjectSettings/VFXManager.asset | Bin 0 -> 4148 bytes 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 ProjectSettings/PresetManager.asset create mode 100644 ProjectSettings/VFXManager.asset 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 0000000000000000000000000000000000000000..df73dc414b96805279a4e400a91215562f5d89df GIT binary patch literal 4104 zcmeH_yGlbr5Qb-S^?uhzL41K|EWCgOix3ozM6nM?J(_4DYL0@1u$@n!t&OCzQLL=& ztSxMP6p#PEdm_d+5O!eB%zQgLyZa|1@hOpk4iOndL=c&s$u4AOGui#De1&1C6xihS z{g#B`(O2{KF86%%@Rnb@YRZd&(_co;{!YWR;Thbef||WuKRhWb;HRj0Za1PmH`Vqoo}rdGKi&4O zUUK7U*~Cu1i#2t!JYjUZM$P&Ch|#;+=9?dKnS1R0Te=OhA4YzQ$oag>5Fw2Bxkr42 zlMlmb3a_O8EgeP-(}w@nVKm~UGr!>nMeo=<@Xw@P&inh`c`aD4HUf!q+hT}Kw=Yk8 z3HYg(H@u*F;ghW9QQAR!tV^YU0}IufT`GA&%rYSt5Ep_Q z58ws7fL=kjEThG?WuG@m4*1w8Q}O02~w$stg^L1PUy&s&;#n#Z8Cg?{4aH%Nj9I%zQ0i6A-t>WpbNtTP_+K<5ZO z>+m}`{_0F>Hmnm3xu89q^AtV%z<0zkSx3ZCaWdz3h+XEEzV9-2_`WmDby{?Q*-Iq% zvmqDs0Ct0(=jV_d>;v-wYUaT|NmR)l7wo2eE?p`Xm7B`68tsmfr3