fix vr and save imported abr textures

This commit is contained in:
2019-03-12 22:31:38 +01:00
parent 0c71feedf7
commit 5a6f6f524a
2 changed files with 5 additions and 1 deletions

View File

@@ -224,7 +224,7 @@ void App::vr_draw(const glm::mat4& proj, const glm::mat4& camera, const glm::mat
// draw the cursor
{
auto cur = (glm::vec2(cursor.x / width, 1.f - cursor.y / height) - 0.5f) * 2.f;
auto cur = (glm::vec2(cursor.x / width * zoom, 1.f - cursor.y / height * zoom) - 0.5f) * 2.f;
auto mvp = proj * camera *
glm::scale(glm::vec3(100)) *
glm::transpose(canvas->m_canvas->m_cam_rot) *

View File

@@ -85,6 +85,8 @@ bool NodePanelStroke::import_abr(const std::string& path)
async_update();
async_end();
});
m_brush_popup->save();
parallel_for(abr.m_patterns.size(), [&](size_t i)
//for (const auto& patt : abr.m_patterns)
{
@@ -116,6 +118,8 @@ bool NodePanelStroke::import_abr(const std::string& path)
async_update();
async_end();
});
m_pattern_popup->save();
auto brushes = abr.compute_brushes(App::I.data_path);
for (const auto& pr : brushes)
{