fix quick panel color slots, remove RGBA float framebuffers, disable merge framebuffers

This commit is contained in:
2019-05-16 17:02:20 +02:00
parent 4f39dcf61d
commit ab9767556f
5 changed files with 31 additions and 30 deletions

View File

@@ -1082,7 +1082,7 @@ void App::brush_update()
quick->m_slider_size->set_value(stroke->m_tip_size->get_value());
*quick->m_button_brush_current_preview->m_brush = *Canvas::I->m_current_brush;
quick->m_button_brush_current_preview->draw_stroke();
quick->m_button_color_current_inner->m_color = Canvas::I->m_current_brush->m_tip_color;
//quick->m_button_color_current_inner->m_color = Canvas::I->m_current_brush->m_tip_color;
if (floating_picker)
floating_picker->set_color(Canvas::I->m_current_brush->m_tip_color);
if (floating_color)