From ef7098b39aae5243ea19a1f7ea223e900da93292 Mon Sep 17 00:00:00 2001
From: Geenz <geenz@geenzo.com>
Date: Tue, 26 Apr 2016 17:12:04 -0400
Subject: [PATCH] Missed a few.

---
 libraries/entities/src/ParticleEffectEntityItem.h | 8 ++++----
 libraries/render-utils/src/text/Font.cpp          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/entities/src/ParticleEffectEntityItem.h b/libraries/entities/src/ParticleEffectEntityItem.h
index ba6f32b51f..28af5d5d59 100644
--- a/libraries/entities/src/ParticleEffectEntityItem.h
+++ b/libraries/entities/src/ParticleEffectEntityItem.h
@@ -49,7 +49,7 @@ public:
 
     const rgbColor& getColor() const { return _color; }
     xColor getXColor() const { xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; }
-    glm::vec3 getColorRGB() const { return  ColorUtils::toLinearVec3(toGlm(getXColor())); }
+    glm::vec3 getColorRGB() const { return  ColorUtils::tosRGBVec3(toGlm(getXColor())); }
 
     static const xColor DEFAULT_COLOR;
     void setColor(const rgbColor& value) { memcpy(_color, value, sizeof(_color)); }
@@ -62,17 +62,17 @@ public:
     bool _isColorStartInitialized = false;
     void setColorStart(const xColor& colorStart) { _colorStart = colorStart; _isColorStartInitialized = true; }
     xColor getColorStart() const { return _isColorStartInitialized ? _colorStart : getXColor(); }
-    glm::vec3 getColorStartRGB() const { return _isColorStartInitialized ? ColorUtils::toLinearVec3(toGlm(_colorStart)) : getColorRGB(); }
+    glm::vec3 getColorStartRGB() const { return _isColorStartInitialized ? ColorUtils::tosRGBVec3(toGlm(_colorStart)) : getColorRGB(); }
 
     bool _isColorFinishInitialized = false;
     void setColorFinish(const xColor& colorFinish) { _colorFinish = colorFinish; _isColorFinishInitialized = true; }
     xColor getColorFinish() const { return _isColorFinishInitialized ? _colorFinish : getXColor(); }
-    glm::vec3 getColorFinishRGB() const { return _isColorStartInitialized ? ColorUtils::toLinearVec3(toGlm(_colorFinish)) : getColorRGB(); }
+    glm::vec3 getColorFinishRGB() const { return _isColorStartInitialized ? ColorUtils::tosRGBVec3(toGlm(_colorFinish)) : getColorRGB(); }
 
     static const xColor DEFAULT_COLOR_SPREAD;
     void setColorSpread(const xColor& colorSpread) { _colorSpread = colorSpread; }
     xColor getColorSpread() const { return _colorSpread; }
-    glm::vec3 getColorSpreadRGB() const { return ColorUtils::toLinearVec3(toGlm(_colorSpread)); }
+    glm::vec3 getColorSpreadRGB() const { return ColorUtils::tosRGBVec3(toGlm(_colorSpread)); }
 
     static const float MAXIMUM_ALPHA;
     static const float MINIMUM_ALPHA;
diff --git a/libraries/render-utils/src/text/Font.cpp b/libraries/render-utils/src/text/Font.cpp
index e7604544bd..532e5efcdd 100644
--- a/libraries/render-utils/src/text/Font.cpp
+++ b/libraries/render-utils/src/text/Font.cpp
@@ -363,7 +363,7 @@ void Font::drawString(gpu::Batch& batch, float x, float y, const QString& str, c
     batch._glUniform1i(_outlineLoc, (effectType == OUTLINE_EFFECT));
     
     // need the gamma corrected color here
-    glm::vec4 lrgba = glm::vec4(ColorUtils::toLinearVec3(glm::vec3(*color)), color->a);
+    glm::vec4 lrgba = glm::vec4(ColorUtils::tosRGBVec3(glm::vec3(*color)), color->a);
     batch._glUniform4fv(_colorLoc, 1, (const float*)&lrgba);
 
     batch.setInputFormat(_format);