Merge branch 'dev'

whiteflare · Aug 6, 2020 · 2f23ff9 · 2f23ff9
2 parents 26af07e + 94aba53
commit 2f23ff9
Show file tree

Hide file tree

Showing 28 changed files with 1,835 additions and 301 deletions.
diff --git a/Editor/WF_Common.cs b/Editor/WF_Common.cs
diff --git a/Editor/WF_ShaderToolWindow.cs b/Editor/WF_ShaderToolWindow.cs
diff --git a/Matcaps/MedianCap/mcap_WF_影あり_肌用_褐色ぬるてか_光沢あり体用・無彩色.png b/Matcaps/MedianCap/mcap_WF_影あり_肌用_褐色ぬるてか_光沢あり体用・無彩色.png
diff --git a/Matcaps/MedianCap/mcap_WF_影あり_肌用_褐色ぬるてか_光沢あり体用・無彩色.png.meta b/Matcaps/MedianCap/mcap_WF_影あり_肌用_褐色ぬるてか_光沢あり体用・無彩色.png.meta