diff options
Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge
Diffstat (limited to 'bin/assets/TexturesAssetSet')
| -rw-r--r-- | bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 7 | ||||
| -rw-r--r-- | bin/assets/TexturesAssetSet/default_iris.jp2 | bin | 0 -> 15719 bytes |
2 files changed, 7 insertions, 0 deletions
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml index 3af9c99..ecf2005 100644 --- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml +++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml | |||
| @@ -430,6 +430,13 @@ | |||
| 430 | <Key Name="fileName" Value="default_avatar.jp2" /> | 430 | <Key Name="fileName" Value="default_avatar.jp2" /> |
| 431 | </Section> | 431 | </Section> |
| 432 | 432 | ||
| 433 | <Section Name="Default Iris"> | ||
| 434 | <Key Name="assetID" Value="6522e74d-1660-4e7f-b601-6f48c1659a77"/> | ||
| 435 | <Key Name="name" Value="Default Iris"/> | ||
| 436 | <Key Name="assetType" Value="0" /> | ||
| 437 | <Key Name="fileName" Value="default_iris.jp2" /> | ||
| 438 | </Section> | ||
| 439 | |||
| 433 | <Section Name="Cypress 1"> | 440 | <Section Name="Cypress 1"> |
| 434 | <Key Name="assetID" Value="fb2ae204-3fd1-df33-594f-c9f882830e66"/> | 441 | <Key Name="assetID" Value="fb2ae204-3fd1-df33-594f-c9f882830e66"/> |
| 435 | <Key Name="name" Value="Cypress 1"/> | 442 | <Key Name="name" Value="Cypress 1"/> |
diff --git a/bin/assets/TexturesAssetSet/default_iris.jp2 b/bin/assets/TexturesAssetSet/default_iris.jp2 new file mode 100644 index 0000000..b932a06 --- /dev/null +++ b/bin/assets/TexturesAssetSet/default_iris.jp2 | |||
| Binary files differ | |||