From 9af350eb41a3b4a58653c5f17c1304c49a51ab47 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 1 Oct 2004 22:05:40 +0000 Subject: [PATCH] From Lewis Harmon, fixes to the Node and NodeCallback constructors. --- Make/makedirdefs | 2 +- include/osg/NodeCallback | 4 ++-- src/osg/Node.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Make/makedirdefs b/Make/makedirdefs index 5f89e2271..230a864fb 100644 --- a/Make/makedirdefs +++ b/Make/makedirdefs @@ -182,6 +182,7 @@ EXAMPLE_DIRS = \ osgsimplifier\ osgspacewarp\ osgspheresegment\ + osgspotlight\ osgstereoimage\ osgteapot\ osgtesselate\ @@ -197,7 +198,6 @@ EXAMPLE_DIRS = \ osgvolume\ osgwindows\ -# osgspotlight\ ifeq ($(GDAL_INSTALLED),yes) diff --git a/include/osg/NodeCallback b/include/osg/NodeCallback index 2a832cd41..93f4ef8c5 100644 --- a/include/osg/NodeCallback +++ b/include/osg/NodeCallback @@ -29,8 +29,8 @@ class SG_EXPORT NodeCallback : public virtual Object { NodeCallback(){} - NodeCallback(const NodeCallback&,const CopyOp&): - _nestedCallback(_nestedCallback) {} + NodeCallback(const NodeCallback& nc,const CopyOp&): + _nestedCallback(nc._nestedCallback) {} META_Object(osg,NodeCallback); diff --git a/src/osg/Node.cpp b/src/osg/Node.cpp index 95ea76f98..50cf2231e 100644 --- a/src/osg/Node.cpp +++ b/src/osg/Node.cpp @@ -36,7 +36,7 @@ Node::Node() Node::Node(const Node& node,const CopyOp& copyop): Object(node,copyop), - _bsphere(_bsphere), + _bsphere(node._bsphere), _bsphere_computed(node._bsphere_computed), _name(node._name), _parents(), // leave empty as parentList is managed by Group.