omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tip change

Browse Source
This commit is contained in:
omigamedev
2019-03-02 14:59:00 +01:00
parent e88ddf55c7
commit 98754d01c1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/brush.cpp
View File

@@ -326,7 +326,7 @@ void Stroke::start(const std::shared_ptr<Brush>& brush)
bool Brush::load_tip(const std::string& path, const std::string& thumb) bool Brush::load_tip(const std::string& path, const std::string& thumb)
{ {
if (m_tip_texture) if (m_tip_texture && m_brush_path == path)
return true; return true;
m_tip_texture = std::make_shared<Texture2D>(); m_tip_texture = std::make_shared<Texture2D>();
if (!m_tip_texture->load(path)) if (!m_tip_texture->load(path))
@@ -345,7 +345,7 @@ bool Brush::load_tip(const std::string& path, const std::string& thumb)
bool Brush::load_dual(const std::string& path, const std::string& thumb) bool Brush::load_dual(const std::string& path, const std::string& thumb)
{ {
if (m_dual_texture) if (m_dual_texture && m_dual_path == path)
return true; return true;
m_dual_texture = std::make_shared<Texture2D>(); m_dual_texture = std::make_shared<Texture2D>();
if (!m_dual_texture->load(path)) if (!m_dual_texture->load(path))
@@ -362,7 +362,7 @@ bool Brush::load_dual(const std::string& path, const std::string& thumb)
bool Brush::load_pattern(const std::string& path, const std::string& thumb) bool Brush::load_pattern(const std::string& path, const std::string& thumb)
{ {
if (m_pattern_texture) if (m_pattern_texture && m_pattern_path == path)
return true; return true;
m_pattern_texture = std::make_shared<Texture2D>(); m_pattern_texture = std::make_shared<Texture2D>();
if (!m_pattern_texture->load(path)) if (!m_pattern_texture->load(path))