From 76066c2057ab44bce752e033ca786ab3caa4d40d Mon Sep 17 00:00:00 2001
From: jwendt <wendt@vr.rwth-aachen.de>
Date: Thu, 1 Mar 2018 15:04:47 +0100
Subject: [PATCH] minor bugfixes

---
 CMakeLists.txt           | 4 ++--
 library/phx/material.hpp | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a51de16c..09a00f1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,8 +46,8 @@ include(GenerateExportHeader)
 include(WarningLevels)
 
 conan_or_find_package(gl REQUIRED)
-conan_or_find_package(Boost.Optional REQUIRED)
-conan_or_find_package(Boost.Signals2 REQUIRED)
+conan_or_find_package(boost_optional REQUIRED)
+conan_or_find_package(boost_signals2 REQUIRED)
 conan_or_find_package(glew REQUIRED)
 conan_or_find_package(glm REQUIRED)
 conan_or_find_package(assimp REQUIRED)
diff --git a/library/phx/material.hpp b/library/phx/material.hpp
index ac962d55..9f28d66f 100644
--- a/library/phx/material.hpp
+++ b/library/phx/material.hpp
@@ -78,9 +78,6 @@ class PHOENIX_EXPORT Material : public Resource {
   void SetTexture(ResourcePointer<Image> image,
                   std::shared_ptr<gl::texture_2d>* texture);
 
-  ResourceProxy* ambient_image_ = nullptr;
-  ResourceProxy* diffuse_image_ = nullptr;
-  ResourceProxy* specular_image_ = nullptr;
   ResourcePointer<Image> ambient_image_{nullptr};
   ResourcePointer<Image> diffuse_image_{nullptr};
   ResourcePointer<Image> specular_image_{nullptr};
-- 
GitLab