Mercurial > hg > orthanc-stone

diff Framework/Scene2D/Internals/OpenGLTextProgram.cpp @ 860:238693c3bc51 am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents 61ba4b504e9a
children 1091b2adeb5a
line wrap: on
line diff
--- a/Framework/Scene2D/Internals/OpenGLTextProgram.cpp	Wed Jun 19 17:36:33 2019 +0200
+++ b/Framework/Scene2D/Internals/OpenGLTextProgram.cpp	Mon Jun 24 14:35:00 2019 +0200
@@ -75,9 +75,9 @@
                                   const GlyphTextureAlphabet& alphabet,
                                   const TextSceneLayer& layer) :
       context_(context),
-      red_(layer.GetRedAsFloat()),
-      green_(layer.GetGreenAsFloat()),
-      blue_(layer.GetBlueAsFloat()),
+      red_(layer.GetColor().GetRedAsFloat()),
+      green_(layer.GetColor().GetGreenAsFloat()),
+      blue_(layer.GetColor().GetBlueAsFloat()),
       x_(layer.GetX()),
       y_(layer.GetY()),
       border_(layer.GetBorder()),