[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/DummyXShape.cxx  |    4 +---
 chart2/source/view/main/OpenGLRender.cxx |    1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit dfed9791ae4752ff3b47c570239c96fdb38ec663
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Wed Jan 22 06:20:18 2014 +0100

    enable transparency again
    
    Change-Id: I5c3464995f3ef6bfe6c4e6895fa9f73e801a31b5

diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 9421a16..b6ceda2 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -360,14 +360,12 @@ void DummyPieSegment2D::render()
         sal_Int32 nColor = itr->second.get<sal_Int32>();
         pChart->m_GLRender.SetColor(nColor);
     }
-    /*
     itr = maProperties.find(UNO_NAME_FILL_TRANSPARENCE);
     if(itr != maProperties.end())
     {
         sal_Int32 transparency = itr->second.get<sal_Int32>();
-        pChart->m_GLRender.SetTransparency(transparency&(0xFF));
+        pChart->m_GLRender.SetTransparency(255-(transparency&(0xFF)));
     }
-    */
 
     float nSize = std::max<float>(maUnitCircleToScene.Line1.Column1, maUnitCircleToScene.Line2.Column2);
     pChart->m_GLRender.RenderPieSegment2DShape(nSize, maUnitCircleToScene.Line1.Column4 + maOffset.DirectionX,
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index e570a9e..980c074 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1806,7 +1806,6 @@ int OpenGLRender::RenderPieSegment2DShape(float fSize, float fPosX, float fPosY)
         CHECK_GL_ERROR();
 
     }
-    glEnable(GL_MULTISAMPLE);
     m_fZStep += 0.01f;
 
     CHECK_GL_ERROR();