summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-08-25 19:55:03 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-08-29 17:40:35 +0200
commit0c092af2eb5f07fa18ea53b5dbe344fccda4389b (patch)
treed348540a4a7f8f1431e234671871d533062ecc37 /chart2
parentfe20f974cada3e1637e9f40508b6cfda1bc5b7d2 (diff)
Don't render with mp2DRenderer when we have 3D charts
Change-Id: Icb224f2d3dd55580532b1c4c43781ad444e51a43
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/view/main/ChartView.cxx19
1 files changed, 11 insertions, 8 deletions
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 7ceccc06e1bc..d2dfbf535af9 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2708,15 +2708,18 @@ void ChartView::createShapes()
void ChartView::render()
{
- AbstractShapeFactory* pShapeFactory = AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory);
- OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow();
- if(pWindow)
- pWindow->setRenderer(mp2DRenderer.get());
- bool bRender = pShapeFactory->preRender(pWindow);
- if(bRender)
+ if(!isReal3DChart())
{
- pShapeFactory->render(mxRootShape, pWindow != mp2DRenderer->getOpenGLWindow());
- pShapeFactory->postRender(pWindow);
+ AbstractShapeFactory* pShapeFactory = AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory);
+ OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow();
+ if(pWindow)
+ pWindow->setRenderer(mp2DRenderer.get());
+ bool bRender = pShapeFactory->preRender(pWindow);
+ if(bRender)
+ {
+ pShapeFactory->render(mxRootShape, pWindow != mp2DRenderer->getOpenGLWindow());
+ pShapeFactory->postRender(pWindow);
+ }
}
}