diff --git a/CMakeLists.txt b/CMakeLists.txt index a51de16cb8e7762bb26382c0107c391413064dd5..09a00f1f0b518516658fcd8cd92418d8dea66257 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 ac962d55da2ae2671da54bfbd5aed16268395c49..9f28d66f0e958e5757e87674d9154633daf51627 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};