Skip to content

Commit e4b8990

Browse files
committed
merge master
2 parents 30adeb2 + 2c9e40a commit e4b8990

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1236
-199
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
**/.idea/
2121

2222
## Unity ##
23-
*.meta
23+
[Aa]ssets/**/*.meta
24+
![Aa]ssets/FbxExporters/**/*.meta
2425
[Pp]rojectSettings/*.asset
2526
[Pp]rojectSettings/*.txt
2627

Assets/FbxExporters/Editor.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/FbxExporters/Editor/ConvertToModel.cs.meta

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/FbxExporters/Editor/EditorRotate.cs.meta

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)