iOS: fix app id in path, pen pressure filtering on Line

This commit is contained in:
2019-03-11 11:40:17 +01:00
parent 5cd80f41fa
commit 373e7ad0e9
6 changed files with 48 additions and 13 deletions

View File

@@ -48,6 +48,8 @@ bool NodeButtonBrush::read(BinaryStreamReader& r)
d.value<Serializer::CString>("high_path", high_path);
d.value<Serializer::CString>("thumb_path", thumb_path);
d.value<Serializer::Boolean>("m_user_brush", m_user_brush);
high_path = str_replace(high_path, "{data_path}", App::I.data_path);
thumb_path = str_replace(thumb_path, "{data_path}", App::I.data_path);
return true;
}
@@ -57,8 +59,10 @@ void NodeButtonBrush::write(BinaryStreamWriter& w) const
d.class_id = "brush";
d.name = L"Brush class";
d.props["brush_name"] = std::make_shared<Serializer::CString>(brush_name);
d.props["high_path"] = std::make_shared<Serializer::CString>(high_path);
d.props["thumb_path"] = std::make_shared<Serializer::CString>(thumb_path);
d.props["high_path"] = std::make_shared<Serializer::CString>(
str_replace(high_path, App::I.data_path, "{data_path}"));
d.props["thumb_path"] = std::make_shared<Serializer::CString>(
str_replace(thumb_path, App::I.data_path, "{data_path}"));
d.props["m_user_brush"] = std::make_shared<Serializer::Boolean>(m_user_brush);
w << d;
}
@@ -544,7 +548,7 @@ bool NodePanelBrushPreset::restore()
auto vmin = sr.ru16();
if (vmaj != 0 && vmin != 1)
{
LOG("unrecognised version %d.$d", vmaj, vmin);
LOG("unrecognised version %d.%d", vmaj, vmin);
return false;
}