Commit fc1e4543 authored by Dmitry Kazakov's avatar Dmitry Kazakov

Fix conflict

parent a3a0876c
......@@ -412,11 +412,10 @@ void KisCanvas2::createOpenGLCanvas()
void KisCanvas2::createCanvas(bool useOpenGL)
{
// deinitialize previous canvas structures
m_d->prescaledProjection = 0;
m_d->openGLImageTextures = 0;
m_d->frameCache = 0;
KisConfig cfg;
QDesktopWidget dw;
const KoColorProfile *profile = cfg.displayProfile(dw.screenNumber(imageView()));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment