diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:00:24 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:03:16 +0300 |
commit | cfbfbea7d932f98c3f541bb4fc3e975ffb7a5658 (patch) | |
tree | bed376368e9611c751cf1dd75b85de2827d67325 /src/datavisualization/engine/engine.qrc | |
parent | 8435c15d224a4e9db0920ecd33c4bea3e70d83bf (diff) | |
parent | c51e0f83ef6dd9e85db6953995585ba0cafb35d7 (diff) |
Merge branch 'develop'
Change-Id: I3d06158cec5e54f69ff3d0606b7d1dfe1a8a2f70
Diffstat (limited to 'src/datavisualization/engine/engine.qrc')
-rw-r--r-- | src/datavisualization/engine/engine.qrc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/datavisualization/engine/engine.qrc b/src/datavisualization/engine/engine.qrc index 18cba7fe..673b6ee0 100644 --- a/src/datavisualization/engine/engine.qrc +++ b/src/datavisualization/engine/engine.qrc @@ -24,7 +24,7 @@ <file alias="bevelbarSmoothFull">meshes/barFilledSmooth.obj</file> <file alias="barFull">meshes/cubeFilledFlat.obj</file> <file alias="barSmoothFull">meshes/cubeFilledSmooth.obj</file> - <file alias="negativeBackground">meshes/backgroundNegatives.obj</file> + <file alias="backgroundNoFloor">meshes/backgroundNoFloor.obj</file> <file alias="minimal">meshes/minimalFlat.obj</file> <file alias="minimalSmooth">meshes/minimalSmooth.obj</file> <file alias="arrow">meshes/arrowFlat.obj</file> @@ -54,5 +54,8 @@ <file alias="fragmentSurfaceShadowNoTex">shaders/surfaceShadowNoTex.frag</file> <file alias="fragmentSurfaceShadowFlat">shaders/surfaceShadowFlat.frag</file> <file alias="vertexSurfaceShadowFlat">shaders/surfaceShadowFlat.vert</file> + <file alias="fragmentTexture">shaders/texture.frag</file> + <file alias="fragmentTextureES2">shaders/texture_ES2.frag</file> + <file alias="vertexTexture">shaders/texture.vert</file> </qresource> </RCC> |