diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-25 01:00:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-25 01:00:11 +0100 |
| commit | 9893e71cea5de10193376c1733db627ef0783614 (patch) | |
| tree | 391fabceb9d4ff6ba5f3ff2c2ec42acb613eb4ef /src/particles | |
| parent | 87e7203532d69e0aaa0898a972d1d90fa589d519 (diff) | |
| parent | e1b4b267aa8c4d9c53e5af4def54f5e9e14e0103 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Icb61522fb41a35303bb3d201b344a0407f67f9a0
Diffstat (limited to 'src/particles')
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_colored.frag.qsb | bin | 1572 -> 1506 bytes |
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_colored.vert.qsb | bin | 3329 -> 3293 bytes |
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_deformed.frag.qsb | bin | 1601 -> 1516 bytes |
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_deformed.vert.qsb | bin | 4712 -> 4641 bytes |
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_simple.frag.qsb | bin | 1581 -> 1512 bytes |
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_simple.vert.qsb | bin | 3261 -> 3160 bytes |
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_sprite.frag.qsb | bin | 1918 -> 1846 bytes |
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_sprite.vert.qsb | bin | 5367 -> 5330 bytes |
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_tabled.frag.qsb | bin | 1777 -> 1709 bytes |
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_tabled.vert.qsb | bin | 4929 -> 4987 bytes |
10 files changed, 0 insertions, 0 deletions
diff --git a/src/particles/shaders_ng/imageparticle_colored.frag.qsb b/src/particles/shaders_ng/imageparticle_colored.frag.qsb Binary files differindex aa6ae5c6bc..106109271e 100644 --- a/src/particles/shaders_ng/imageparticle_colored.frag.qsb +++ b/src/particles/shaders_ng/imageparticle_colored.frag.qsb diff --git a/src/particles/shaders_ng/imageparticle_colored.vert.qsb b/src/particles/shaders_ng/imageparticle_colored.vert.qsb Binary files differindex a07c8d0e79..e29c1029c1 100644 --- a/src/particles/shaders_ng/imageparticle_colored.vert.qsb +++ b/src/particles/shaders_ng/imageparticle_colored.vert.qsb diff --git a/src/particles/shaders_ng/imageparticle_deformed.frag.qsb b/src/particles/shaders_ng/imageparticle_deformed.frag.qsb Binary files differindex 1f4a08fe48..d2f74b40df 100644 --- a/src/particles/shaders_ng/imageparticle_deformed.frag.qsb +++ b/src/particles/shaders_ng/imageparticle_deformed.frag.qsb diff --git a/src/particles/shaders_ng/imageparticle_deformed.vert.qsb b/src/particles/shaders_ng/imageparticle_deformed.vert.qsb Binary files differindex 6a2048c5bf..c2e5bab0cb 100644 --- a/src/particles/shaders_ng/imageparticle_deformed.vert.qsb +++ b/src/particles/shaders_ng/imageparticle_deformed.vert.qsb diff --git a/src/particles/shaders_ng/imageparticle_simple.frag.qsb b/src/particles/shaders_ng/imageparticle_simple.frag.qsb Binary files differindex f580048e71..8031dc8765 100644 --- a/src/particles/shaders_ng/imageparticle_simple.frag.qsb +++ b/src/particles/shaders_ng/imageparticle_simple.frag.qsb diff --git a/src/particles/shaders_ng/imageparticle_simple.vert.qsb b/src/particles/shaders_ng/imageparticle_simple.vert.qsb Binary files differindex 6735e1ae38..03f71415f5 100644 --- a/src/particles/shaders_ng/imageparticle_simple.vert.qsb +++ b/src/particles/shaders_ng/imageparticle_simple.vert.qsb diff --git a/src/particles/shaders_ng/imageparticle_sprite.frag.qsb b/src/particles/shaders_ng/imageparticle_sprite.frag.qsb Binary files differindex 01806a3c54..847de59aa6 100644 --- a/src/particles/shaders_ng/imageparticle_sprite.frag.qsb +++ b/src/particles/shaders_ng/imageparticle_sprite.frag.qsb diff --git a/src/particles/shaders_ng/imageparticle_sprite.vert.qsb b/src/particles/shaders_ng/imageparticle_sprite.vert.qsb Binary files differindex 6d8c1852f5..e310af8fc8 100644 --- a/src/particles/shaders_ng/imageparticle_sprite.vert.qsb +++ b/src/particles/shaders_ng/imageparticle_sprite.vert.qsb diff --git a/src/particles/shaders_ng/imageparticle_tabled.frag.qsb b/src/particles/shaders_ng/imageparticle_tabled.frag.qsb Binary files differindex 630fb064ac..6fe2d5a3f2 100644 --- a/src/particles/shaders_ng/imageparticle_tabled.frag.qsb +++ b/src/particles/shaders_ng/imageparticle_tabled.frag.qsb diff --git a/src/particles/shaders_ng/imageparticle_tabled.vert.qsb b/src/particles/shaders_ng/imageparticle_tabled.vert.qsb Binary files differindex af0f475bb8..740f6b6769 100644 --- a/src/particles/shaders_ng/imageparticle_tabled.vert.qsb +++ b/src/particles/shaders_ng/imageparticle_tabled.vert.qsb |