implementing color wheel and new color picker

2017-11-23 20:26:57 +00:00
parent d44434a458
commit a90aa4a60e
23 changed files with 371 additions and 26 deletions
--- a/engine/node_canvas.cpp
+++ b/engine/node_canvas.cpp
@@ -143,7 +143,7 @@ void NodeCanvas::draw()
            }
            else if(m_canvas->m_show_tmp && m_canvas->m_current_layer_idx == layer_index)
            {
-                m_sampler.bind(0);
+                m_sampler_linear.bind(0);
                auto& paper = TextureManager::get(const_hash("data/paper.jpg"));
                ui::ShaderManager::use(kShader::CompDraw);
                ui::ShaderManager::u_int(kShaderUniform::Tex, 0);