From 90fbc956cceb7d41b6179ee453ae542d3e447ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 28 May 2012 22:42:37 +0200 Subject: [PATCH] More unique name for PhongShader resources. --- src/Shaders/CMakeLists.txt | 2 +- src/Shaders/PhongShader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Shaders/CMakeLists.txt b/src/Shaders/CMakeLists.txt index 373cce71f..979a32372 100644 --- a/src/Shaders/CMakeLists.txt +++ b/src/Shaders/CMakeLists.txt @@ -1,4 +1,4 @@ -corrade_add_resource(Shaders shaders PhongShader.frag PhongShader.vert) +corrade_add_resource(Shaders MagnumShaders PhongShader.frag PhongShader.vert) set(Shaders_SRCS PhongShader.cpp ${Shaders} diff --git a/src/Shaders/PhongShader.cpp b/src/Shaders/PhongShader.cpp index 67500d9f2..363c91bcd 100644 --- a/src/Shaders/PhongShader.cpp +++ b/src/Shaders/PhongShader.cpp @@ -20,7 +20,7 @@ namespace Magnum { namespace Shaders { PhongShader::PhongShader() { - Corrade::Utility::Resource rs("shaders"); + Corrade::Utility::Resource rs("MagnumShaders"); attachShader(Shader::fromData(Shader::Type::Vertex, rs.get("PhongShader.vert"))); attachShader(Shader::fromData(Shader::Type::Fragment, rs.get("PhongShader.frag")));