Merge branch 'master' into libktx

2019-09-06 19:20:35 +02:00 · 2019-09-06 19:20:35 +02:00 · d33fc23e0b
commit d33fc23e0b
parent a6d9b57d7c 36bf3dd31a
10 changed files with 30 additions and 21 deletions
--- a/android/examples/parallaxmapping/build.gradle
+++ b/android/examples/parallaxmapping/build.gradle
@ -63,7 +63,7 @@ task copyTask {
    copy {
       from '../../../data/textures'
       into 'assets/textures'
-       include 'rocks_normal_height_rgba.dds'
+       include 'rocks_normal_height_rgba.ktx'
    }

    copy {