FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fixed incorrect cast" as commit contained more changes than intended.

Browse Source 
This reverts commit 2897ab13cb.
This commit is contained in:
Robert Osfield 2016-06-29 11:34:20 +01:00
parent 8d7d5d12a1
commit e30b570b1f
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/CMakeLists.txt
View File

@ -101,7 +101,6 @@ IF(DYNAMIC_OPENSCENEGRAPH)
ADD_SUBDIRECTORY(osgscribe) ADD_SUBDIRECTORY(osgscribe)
ADD_SUBDIRECTORY(osgsequence) ADD_SUBDIRECTORY(osgsequence)
ADD_SUBDIRECTORY(osgshaders) ADD_SUBDIRECTORY(osgshaders)
ADD_SUBDIRECTORY(osgshadermultiviewport)
ADD_SUBDIRECTORY(osgshadercomposition) ADD_SUBDIRECTORY(osgshadercomposition)
ADD_SUBDIRECTORY(osgshadergen) ADD_SUBDIRECTORY(osgshadergen)
ADD_SUBDIRECTORY(osgshaderterrain) ADD_SUBDIRECTORY(osgshaderterrain)

2
src/osg/CMakeLists.txt
View File

@ -222,7 +222,6 @@ SET(TARGET_H
${HEADER_PATH}/VertexProgram ${HEADER_PATH}/VertexProgram
${HEADER_PATH}/View ${HEADER_PATH}/View
${HEADER_PATH}/Viewport ${HEADER_PATH}/Viewport
${HEADER_PATH}/ViewportIndexed
${OPENSCENEGRAPH_VERSION_HEADER} ${OPENSCENEGRAPH_VERSION_HEADER}
${OPENSCENEGRAPH_CONFIG_HEADER} ${OPENSCENEGRAPH_CONFIG_HEADER}
${OPENSCENEGRAPH_OPENGL_HEADER} ${OPENSCENEGRAPH_OPENGL_HEADER}
@ -389,7 +388,6 @@ SET(TARGET_SRC
VertexProgram.cpp VertexProgram.cpp
View.cpp View.cpp
Viewport.cpp Viewport.cpp
ViewportIndexed.cpp
glu/libutil/error.cpp glu/libutil/error.cpp
glu/libutil/mipmap.cpp glu/libutil/mipmap.cpp

2
src/osg/ColorMaski.cpp
View File

@ -39,7 +39,7 @@ void ColorMaski::apply(State& state) const
const GLExtensions* extensions = state.get<GLExtensions>(); const GLExtensions* extensions = state.get<GLExtensions>();
if (extensions->glColorMaski) 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 else
{ {