summaryrefslogtreecommitdiffstats
path: root/src/extras/extras.qrc
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@kdab.com>2017-07-31 09:58:06 +0200
committerSean Harmer <sean.harmer@kdab.com>2017-09-04 11:11:53 +0000
commitc69ebe3a79c727e99d7c654841cb46f0fa967332 (patch)
tree91d629bf3beada4b6b0f007e5f2497be9ef44f2c /src/extras/extras.qrc
parentaa3d86f2b7358dd71bdf78fb275bc2aa21ca23fd (diff)
Use layers to have only one graph for Metal/Rough
Both QMetalRoughMaterial and QTexturedMetalRoughMaterial use the same graph now. Also QMetalRoughMaterial does the job to be clever and activate the right layers depending on the type set on the properties (which is why they are now all variants). QMetalRoughMaterial can then be used as a drop in replacement for QTexturedMetalRoughMaterial. Change-Id: Ia52fe4608aca5558642599ed435f3cd9ac93e651 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/extras/extras.qrc')
-rw-r--r--src/extras/extras.qrc1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/extras/extras.qrc b/src/extras/extras.qrc
index 609f5b9ca..ce959af93 100644
--- a/src/extras/extras.qrc
+++ b/src/extras/extras.qrc
@@ -1,7 +1,6 @@
<RCC>
<qresource prefix="/">
<file>shaders/graphs/metalrough.frag.json</file>
- <file>shaders/graphs/metalroughuniform.frag.json</file>
<file>shaders/gl3/light.inc.frag</file>
<file>shaders/es2/light.inc.frag</file>
<file>shaders/es2/light.inc.frag100</file>