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

update color at picking and cleanup code from some warnings

Browse Source
This commit is contained in:
omigamedev
2019-03-11 15:35:59 +01:00
parent 373e7ad0e9
commit fda399f7dd
16 changed files with 56 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/abr.cpp
View File

@@ -92,7 +92,7 @@ bool ABR::section_patt()
int nc = std::min((int)vm->channels.size(), 3);
if (nc != image_mode)
{
LOG("PATT: image_mode (%d) and number of channels (%d) not matching\n",
LOG("PATT: image_mode (%d) and number of channels (%ld) not matching\n",
image_mode, vm->channels.size());
}
if (auto img = vm->image(true, false))
@@ -271,7 +271,7 @@ std::vector<std::shared_ptr<Brush>> ABR::compute_brushes(const std::string& path
std::string blend_mode = p->value<Enum>("textureBlendMode");
auto bm_it = std::find(modes.begin(), modes.end(), blend_mode);
if (bm_it != modes.end())
b->m_pattern_blend_mode = std::distance(modes.begin(), bm_it);
b->m_pattern_blend_mode = (int)std::distance(modes.begin(), bm_it);
b->m_pattern_enabled = p->value<Boolean>("useTexture");
}
@@ -342,7 +342,7 @@ std::vector<std::shared_ptr<Brush>> ABR::compute_brushes(const std::string& path
std::string blend_mode = db->value<Enum>("BlnM");
auto bm_it = std::find(modes.begin(), modes.end(), blend_mode);
if (bm_it != modes.end())
b->m_dual_blend_mode = std::distance(modes.begin(), bm_it);
b->m_dual_blend_mode = (int)std::distance(modes.begin(), bm_it);
b->m_dual_enabled = db->value<Boolean>("useDualBrush");
}