diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:41:59 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:52:58 +0100 |
| commit | b684ba219493fb7b0108ae367d6d033aaa28053b (patch) | |
| tree | f1fec8922da198e231416b50ef8f441ef6db065b /tests/manual/nodetypes_ng | |
| parent | 97a5cf86345fd72cdff83c03664c19a8f5cdf79a (diff) | |
| parent | 8354851b628ebae567a9125cbd0ba69268470c1b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: Ie3e9dc62031a85e5e81cbdf04694b95159d49fca
Diffstat (limited to 'tests/manual/nodetypes_ng')
| -rwxr-xr-x | tests/manual/nodetypes_ng/compile.bat (renamed from tests/manual/nodetypes_ng/buildshaders.bat) | 0 | ||||
| -rw-r--r-- | tests/manual/nodetypes_ng/shadow_pass1.frag.qsb | bin | 1876 -> 1822 bytes | |||
| -rw-r--r-- | tests/manual/nodetypes_ng/shadow_pass2.frag.qsb | bin | 1790 -> 1745 bytes | |||
| -rw-r--r-- | tests/manual/nodetypes_ng/wobble.frag.qsb | bin | 1673 -> 1627 bytes | |||
| -rw-r--r-- | tests/manual/nodetypes_ng/wobble.vert.qsb | bin | 1678 -> 1641 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/tests/manual/nodetypes_ng/buildshaders.bat b/tests/manual/nodetypes_ng/compile.bat index 328b216c07..328b216c07 100755 --- a/tests/manual/nodetypes_ng/buildshaders.bat +++ b/tests/manual/nodetypes_ng/compile.bat diff --git a/tests/manual/nodetypes_ng/shadow_pass1.frag.qsb b/tests/manual/nodetypes_ng/shadow_pass1.frag.qsb Binary files differindex f90265a997..4c913fee08 100644 --- a/tests/manual/nodetypes_ng/shadow_pass1.frag.qsb +++ b/tests/manual/nodetypes_ng/shadow_pass1.frag.qsb diff --git a/tests/manual/nodetypes_ng/shadow_pass2.frag.qsb b/tests/manual/nodetypes_ng/shadow_pass2.frag.qsb Binary files differindex 9608763b61..4f6e6634e7 100644 --- a/tests/manual/nodetypes_ng/shadow_pass2.frag.qsb +++ b/tests/manual/nodetypes_ng/shadow_pass2.frag.qsb diff --git a/tests/manual/nodetypes_ng/wobble.frag.qsb b/tests/manual/nodetypes_ng/wobble.frag.qsb Binary files differindex 7d3105fd3c..f1766f4363 100644 --- a/tests/manual/nodetypes_ng/wobble.frag.qsb +++ b/tests/manual/nodetypes_ng/wobble.frag.qsb diff --git a/tests/manual/nodetypes_ng/wobble.vert.qsb b/tests/manual/nodetypes_ng/wobble.vert.qsb Binary files differindex 92b8ba9703..2715c84616 100644 --- a/tests/manual/nodetypes_ng/wobble.vert.qsb +++ b/tests/manual/nodetypes_ng/wobble.vert.qsb |