Merge branch 'dev'

whiteflare · Apr 13, 2019 · d57a783 · d57a783
2 parents 7f4f1c3 + 4b103ce
commit d57a783
Show file tree

Hide file tree

Showing 53 changed files with 1,212 additions and 52 deletions.
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_armor.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_armor.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_body.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_body.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_hair.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_hair.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_armor_AMask.png b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_armor_AMask.png
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body.png b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body.png
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_MMask.png b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_MMask.png
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_MMask.png.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_MMask.png.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_Shade1.png.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_Shade1.png.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_Shade2.png.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_Shade2.png.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_ShadeBase.png.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_body_ShadeBase.png.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_faceoption.png.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_faceoption.png.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/eff.png b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/eff.png
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/eff.png.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/eff.png.meta
diff --git a/Matcaps/mcap_WF_Rimなし_フラット光沢_多量.png b/Matcaps/mcap_WF_Rimなし_フラット光沢_多量.png
diff --git a/Matcaps/mcap_WF_Rimなし_フラット光沢_多量.png.meta b/Matcaps/mcap_WF_Rimなし_フラット光沢_多量.png.meta
diff --git a/Matcaps/mcap_WF_Rimなし_フラット光沢_少量.png b/Matcaps/mcap_WF_Rimなし_フラット光沢_少量.png
diff --git a/Matcaps/mcap_WF_Rimなし_フラット光沢_少量.png.meta b/Matcaps/mcap_WF_Rimなし_フラット光沢_少量.png.meta
diff --git a/Matcaps/mcap_WF_Rimなし_ポイント光沢_多量.png b/Matcaps/mcap_WF_Rimなし_ポイント光沢_多量.png
diff --git a/Matcaps/mcap_WF_Rimなし_ポイント光沢_多量.png.meta b/Matcaps/mcap_WF_Rimなし_ポイント光沢_多量.png.meta
diff --git a/Matcaps/mcap_WF_Rimなし_ポイント光沢_少量.png b/Matcaps/mcap_WF_Rimなし_ポイント光沢_少量.png