minor bugfixes

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)

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};