From e30b570b1fc02586611f0bd0ed4b22651684a9e4 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 29 Jun 2016 11:34:20 +0100
Subject: [PATCH] Revert "Fixed incorrect cast" as commit contained more
 changes than intended.

This reverts commit 2897ab13cb14aee914d32fa3e393f4c58bf80816.
---
 examples/CMakeLists.txt | 1 -
 src/osg/CMakeLists.txt  | 2 --
 src/osg/ColorMaski.cpp  | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 349a192b2..ab2f61d99 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -101,7 +101,6 @@ IF(DYNAMIC_OPENSCENEGRAPH)
     ADD_SUBDIRECTORY(osgscribe)
     ADD_SUBDIRECTORY(osgsequence)
     ADD_SUBDIRECTORY(osgshaders)
-    ADD_SUBDIRECTORY(osgshadermultiviewport)
     ADD_SUBDIRECTORY(osgshadercomposition)
     ADD_SUBDIRECTORY(osgshadergen)
     ADD_SUBDIRECTORY(osgshaderterrain)
diff --git a/src/osg/CMakeLists.txt b/src/osg/CMakeLists.txt
index 1b6d8100b..f1ff8321b 100644
--- a/src/osg/CMakeLists.txt
+++ b/src/osg/CMakeLists.txt
@@ -222,7 +222,6 @@ SET(TARGET_H
     ${HEADER_PATH}/VertexProgram
     ${HEADER_PATH}/View
     ${HEADER_PATH}/Viewport
-    ${HEADER_PATH}/ViewportIndexed
     ${OPENSCENEGRAPH_VERSION_HEADER}
     ${OPENSCENEGRAPH_CONFIG_HEADER}
     ${OPENSCENEGRAPH_OPENGL_HEADER}
@@ -389,7 +388,6 @@ SET(TARGET_SRC
     VertexProgram.cpp
     View.cpp
     Viewport.cpp
-    ViewportIndexed.cpp
 
     glu/libutil/error.cpp
     glu/libutil/mipmap.cpp
diff --git a/src/osg/ColorMaski.cpp b/src/osg/ColorMaski.cpp
index 61e7c4f89..1cae24a92 100644
--- a/src/osg/ColorMaski.cpp
+++ b/src/osg/ColorMaski.cpp
@@ -39,7 +39,7 @@ void ColorMaski::apply(State& state) const
     const GLExtensions* extensions = state.get<GLExtensions>();
     if (extensions->glColorMaski)
     {
-        extensions->glColorMaski((GLuint)_index, (GLboolean)_red,(GLboolean)_green,(GLboolean)_blue,(GLboolean)_alpha);
+        extensions->glColorMaski((GLboolean)_index, (GLboolean)_red,(GLboolean)_green,(GLboolean)_blue,(GLboolean)_alpha);
     }
     else
     {