diff options
| author | Marius Kintel <marius@kintel.net> | 2010-08-28 14:10:38 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2010-10-31 00:42:38 (GMT) |
| commit | c868525c6760f97d4cdaf59d35d38becdda4bdf5 (patch) | |
| tree | 7bf8622c7825f02dc2bcef0bd462b66aed75377b /src | |
| parent | d172c353a2b8030ba0b7ca8d3ec6361ebaa2946f (diff) | |
cosmetics
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainwin.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc index a960e3e..f885cd4 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -1407,8 +1407,8 @@ static void renderGLThrownTogether(void *vp); static void renderGLviaOpenCSG(void *vp) { - MainWindow *m = (MainWindow*)vp; - if (!m->enableOpenCSG) { + MainWindow *mainwin = (MainWindow *)vp; + if (!mainwin->enableOpenCSG) { renderGLThrownTogether(vp); return; } @@ -1418,18 +1418,18 @@ static void renderGLviaOpenCSG(void *vp) glewInit(); } #ifdef ENABLE_MDI - OpenCSG::setContext(m->screen->opencsg_id); + OpenCSG::setContext(mainwin->screen->opencsg_id); #endif - if (m->root_chain) { - GLint *shaderinfo = m->screen->shaderinfo; + if (mainwin->root_chain) { + GLint *shaderinfo = mainwin->screen->shaderinfo; if (!shaderinfo[0]) shaderinfo = NULL; - renderCSGChainviaOpenCSG(m->root_chain, m->viewActionShowEdges->isChecked() ? shaderinfo : NULL, false, false); - if (m->background_chain) { - renderCSGChainviaOpenCSG(m->background_chain, m->viewActionShowEdges->isChecked() ? shaderinfo : NULL, false, true); + renderCSGChainviaOpenCSG(mainwin->root_chain, mainwin->viewActionShowEdges->isChecked() ? shaderinfo : NULL, false, false); + if (mainwin->background_chain) { + renderCSGChainviaOpenCSG(mainwin->background_chain, mainwin->viewActionShowEdges->isChecked() ? shaderinfo : NULL, false, true); } - if (m->highlights_chain) { - renderCSGChainviaOpenCSG(m->highlights_chain, m->viewActionShowEdges->isChecked() ? shaderinfo : NULL, true, false); + if (mainwin->highlights_chain) { + renderCSGChainviaOpenCSG(mainwin->highlights_chain, mainwin->viewActionShowEdges->isChecked() ? shaderinfo : NULL, true, false); } } } |