diff --git a/external/ege b/external/ege index 48099a92..d68acc19 160000 --- a/external/ege +++ b/external/ege @@ -1 +1 @@ -Subproject commit 48099a92bb36496f1b2399bc8793b08fd7438748 +Subproject commit d68acc190307c9be0232f3b17cfe0c8cbb3ea683 diff --git a/sources/ewol/resources/Mesh.h b/sources/ewol/resources/Mesh.h index 9228933c..b032da71 100644 --- a/sources/ewol/resources/Mesh.h +++ b/sources/ewol/resources/Mesh.h @@ -107,7 +107,7 @@ namespace ewol etk::Vector m_physics; //!< collision shape module ... (independent of bullet lib) protected: ewol::VirtualBufferObject* m_verticesVBO; - private: + protected: Mesh(const etk::UString& _fileName, const etk::UString& _shaderName="DATA:textured3D2.prog"); virtual ~Mesh(void); public: diff --git a/sources/ewol/resources/Resource.cpp b/sources/ewol/resources/Resource.cpp index 090519e8..8d1c9fca 100644 --- a/sources/ewol/resources/Resource.cpp +++ b/sources/ewol/resources/Resource.cpp @@ -39,7 +39,7 @@ void ewol::Resource::Reload(void) EWOL_DEBUG("Not Set for : [" << m_uniqueId << "]" << m_name << " loaded " << m_counter << " time(s)"); } -ewol::ResourceManager ewol::Resource::GetManager(void) +ewol::ResourceManager& ewol::Resource::GetManager(void) { return ewol::GetContext().GetResourcesManager(); } \ No newline at end of file diff --git a/sources/lutin_ewol.py b/sources/lutin_ewol.py index 325e705c..32de3fbd 100755 --- a/sources/lutin_ewol.py +++ b/sources/lutin_ewol.py @@ -49,6 +49,7 @@ def Create(target): 'ewol/resources/Texture.cpp', 'ewol/resources/Colored3DObject.cpp', 'ewol/resources/Image.cpp', + 'ewol/resources/Resource.cpp', 'ewol/resources/ResourceManager.cpp']) # physical shape parser