From 777b00353a43d51f73ff94dae90b801be488cd3d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 22 Apr 2009 13:07:02 +0000 Subject: [PATCH] From Mathias Froehlich, "attached is a change to TexGenNode rev 10060 that removes a private member variable that is only initialized and copied by never used seriously. " --- include/osg/TexGenNode | 1 - src/osg/TexGenNode.cpp | 3 --- src/osgWrappers/osgViewer/GraphicsWindow.cpp | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/osg/TexGenNode b/include/osg/TexGenNode index 8f33afb3e..546e738ad 100644 --- a/include/osg/TexGenNode +++ b/include/osg/TexGenNode @@ -68,7 +68,6 @@ class OSG_EXPORT TexGenNode : public Group virtual ~TexGenNode(); unsigned int _textureUnit; - StateAttribute::GLModeValue _value; osg::ref_ptr _texgen; ReferenceFrame _referenceFrame; diff --git a/src/osg/TexGenNode.cpp b/src/osg/TexGenNode.cpp index eeb7c480b..db804fa92 100644 --- a/src/osg/TexGenNode.cpp +++ b/src/osg/TexGenNode.cpp @@ -21,7 +21,6 @@ TexGenNode::TexGenNode(): setCullingActive(false); _textureUnit = 0; - _value = StateAttribute::ON; setStateSet(new StateSet); _texgen = new TexGen; } @@ -29,7 +28,6 @@ TexGenNode::TexGenNode(): TexGenNode::TexGenNode(const TexGenNode& cn, const CopyOp& copyop): Group(cn,copyop), _textureUnit(cn._textureUnit), - _value(cn._value), _texgen(static_cast(copyop(cn._texgen.get()))), _referenceFrame(cn._referenceFrame) { @@ -43,7 +41,6 @@ TexGenNode::TexGenNode(TexGen *texgen): setCullingActive(false); _textureUnit = 0; - _value = StateAttribute::ON; setStateSet(new StateSet); _texgen = texgen; } diff --git a/src/osgWrappers/osgViewer/GraphicsWindow.cpp b/src/osgWrappers/osgViewer/GraphicsWindow.cpp index d5b66da1b..02e3ee605 100644 --- a/src/osgWrappers/osgViewer/GraphicsWindow.cpp +++ b/src/osgWrappers/osgViewer/GraphicsWindow.cpp @@ -37,6 +37,7 @@ BEGIN_ENUM_REFLECTOR(osgViewer::GraphicsWindow::MouseCursor) I_EnumLabel(osgViewer::GraphicsWindow::WaitCursor); I_EnumLabel(osgViewer::GraphicsWindow::TextCursor); I_EnumLabel(osgViewer::GraphicsWindow::CrosshairCursor); + I_EnumLabel(osgViewer::GraphicsWindow::HandCursor); I_EnumLabel(osgViewer::GraphicsWindow::UpDownCursor); I_EnumLabel(osgViewer::GraphicsWindow::LeftRightCursor); I_EnumLabel(osgViewer::GraphicsWindow::TopSideCursor);