diff --git a/Sources/Plasma/NucleusLib/inc/plPipeline.h b/Sources/Plasma/NucleusLib/inc/plPipeline.h
index 6d09ee84..4e735828 100644
--- a/Sources/Plasma/NucleusLib/inc/plPipeline.h
+++ b/Sources/Plasma/NucleusLib/inc/plPipeline.h
@@ -321,10 +321,6 @@ public:
virtual void PopMaterialOverride(const hsGMatState& restore, bool on) = 0;
virtual const hsGMatState& GetMaterialOverride(bool on) const = 0;
- virtual hsColorOverride PushColorOverride(const hsColorOverride& over) = 0;
- virtual void PopColorOverride(const hsColorOverride& restore) = 0;
- virtual const hsColorOverride& GetColorOverride() const = 0;
-
virtual void SubmitShadowSlave(plShadowSlave* slave) = 0;
virtual void SubmitClothingOutfit(plClothingOutfit* co) = 0;
diff --git a/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt
index c676d085..7274cdc9 100644
--- a/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt
+++ b/Sources/Plasma/PubUtilLib/plPipeline/CMakeLists.txt
@@ -10,7 +10,6 @@ endif(WIN32)
set(plPipeline_SOURCES
hsG3DDeviceSelector.cpp
- hsGColorizer.cpp
plCaptureRender.cpp
plCubicRenderTargetModifier.cpp
plCullTree.cpp
@@ -40,7 +39,6 @@ set(plDXPipeline_SOURCES
set(plPipeline_HEADERS
hsFogControl.h
hsG3DDeviceSelector.h
- hsGColorizer.h
hsWinRef.h
plCaptureRender.h
plCubicRenderTarget.h
diff --git a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.cpp b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.cpp
index 4ed5654f..e7a6c319 100644
--- a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.cpp
+++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.cpp
@@ -9557,49 +9557,6 @@ const hsGMatState& plDXPipeline::GetMaterialOverride(bool on) const
return on ? fMatOverOn : fMatOverOff;
}
-//// PushColorOverride //////////////////////////////////////////////////
-// Obsolete and unused.
-hsColorOverride plDXPipeline::PushColorOverride(const hsColorOverride& over)
-{
- hsColorOverride ret = GetColorOverride();
- PopColorOverride( over );
- return ret;
-}
-
-// PopColorOverride ////////////////////////////////////////////////////////
-// Obsolete and unused.
-void plDXPipeline::PopColorOverride(const hsColorOverride& restore)
-{
- return;
-/*
- hsColorOverride cpy = restore;
- if( !(cpy.fFlags & hsColorOverride::kModAlpha) )
- cpy.fColor.a = 1.f;
- if( !(cpy.fFlags & (hsColorOverride::kModAlpha | hsColorOverride::kModColor)) )
- fDev->SetColorNormal();
- else
- fDev->SetColorOverride(cpy.fColor, !(cpy.fFlags & hsColorOverride::kModColor));
-*/
-}
-
-//// GetColorOverride /////////////////////////////////////////////////////////
-// Obsolete and unused.
-const hsColorOverride& plDXPipeline::GetColorOverride() const
-{
- static hsColorOverride ret;
- return ret;
-
-/* ret.fFlags = hsColorOverride::kNone;
- if( fDev->GetDebugFlags() & hsG3DDevice::kDeviceColor )
- ret.fFlags |= hsColorOverride::kModColor;
- if( fDev->GetDebugFlags() & hsG3DDevice::kDeviceAlpha )
- ret.fFlags |= hsColorOverride::kModAlpha;
-
- ret.fColor = fDev->GetColorOverride();
-*/
- return ret;
-}
-
///////////////////////////////////////////////////////////////////////////////
//// Transforms ///////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
diff --git a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h
index c584042a..801ab389 100644
--- a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h
+++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h
@@ -770,10 +770,6 @@ public:
virtual void PopMaterialOverride(const hsGMatState& restore, bool on);
virtual const hsGMatState& GetMaterialOverride(bool on) const;
- virtual hsColorOverride PushColorOverride(const hsColorOverride& over);
- virtual void PopColorOverride(const hsColorOverride& restore);
- virtual const hsColorOverride& GetColorOverride() const;
-
virtual void SubmitShadowSlave(plShadowSlave* slave);
virtual void SubmitClothingOutfit(plClothingOutfit* co);
diff --git a/Sources/Plasma/PubUtilLib/plPipeline/hsGColorizer.cpp b/Sources/Plasma/PubUtilLib/plPipeline/hsGColorizer.cpp
deleted file mode 100644
index 119d06f9..00000000
--- a/Sources/Plasma/PubUtilLib/plPipeline/hsGColorizer.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-
-#include "HeadSpin.h"
-#include "plPipeline.h"
-#include "hsGColorizer.h"
-
-bool hsGColorizer::Colorizing()
-{
- return fPipeline ? 0 != (fPipeline->GetColorOverride().fFlags & hsColorOverride::kModColor) : false;
-}
-
-bool hsGColorizer::Alpharizing()
-{
- return fPipeline ? 0 != (fPipeline->GetColorOverride().fFlags & hsColorOverride::kModAlpha) : false;
-}
-
-hsColorRGBA hsGColorizer::GetCurrentColor()
-{
- return fPipeline ? fPipeline->GetColorOverride().fColor : hsColorRGBA().Set(1.f,1.f,1.f,1.f);
-}
-
-void hsGColorizer::Init(plPipeline* pipe)
-{
- fPipeline = pipe;
-}
-
-void hsGColorizer::PushColorize(hsColorRGBA& col, bool alphaOnly)
-{
- if( fPipeline )
- {
- hsColorOverride colorOver;
- colorOver.fFlags = alphaOnly ? hsColorOverride::kModAlpha : hsColorOverride::kModColor | hsColorOverride::kModAlpha;
- colorOver.fColor = col;
- fResetColor = fPipeline->PushColorOverride(colorOver);
- }
-}
-
-void hsGColorizer::PopColorize()
-{
- if( fPipeline )
- {
- fPipeline->PopColorOverride(fResetColor);
- }
-}
-
diff --git a/Sources/Plasma/PubUtilLib/plPipeline/hsGColorizer.h b/Sources/Plasma/PubUtilLib/plPipeline/hsGColorizer.h
deleted file mode 100644
index f1cb446b..00000000
--- a/Sources/Plasma/PubUtilLib/plPipeline/hsGColorizer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*==LICENSE==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
- Cyan Worlds, Inc.
- 14617 N Newport Hwy
- Mead, WA 99021
-
-*==LICENSE==*/
-
-#ifndef hsGColorizer_inc
-#define hsGColorizer_inc
-
-#include "HeadSpin.h"
-#include "hsColorRGBA.h"
-
-class plPipeline;
-
-class hsGColorizer {
-protected:
- hsColorOverride fResetColor;
- plPipeline* fPipeline;
-
-public:
- hsGColorizer() : fPipeline(nil) {}
- bool Colorizing();
- bool Alpharizing();
- hsColorRGBA GetCurrentColor();
- void Init(plPipeline* pipe);
- void PushColorize(hsColorRGBA& col, bool alphaOnly);
- void PopColorize();
-};
-
-#endif // hsGColorizer_inc