Merge remote-tracking branch 'refs/remotes/origin/master' into Disable-debug-mode-in-reflection-view

7 年前 · aacf07b1
--- a/ImageTemplates/Editor.meta
+++ b/ImageTemplates/Editor.meta
+fileFormatVersion: 2
+guid: fcefc1814ee144b5d944354bbf589702
+folderAsset: yes
+timeCreated: 1505900294
+licenseType: Pro
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a//ImageTemplates/Editor/TemplatePreprocessor.cs
+++ b//ImageTemplates/Editor/TemplatePreprocessor.cs
--- a//ImageTemplates/Editor/TemplatePreprocessor.cs.meta
+++ b//ImageTemplates/Editor/TemplatePreprocessor.cs.meta