Changeset 9897

Timestamp:

03/11/09 12:00:24 (4 years ago)

Author:

robert

Message:

From Lionel Lagarde, "The copy constructor of the nodes and the drawables do :

Node::Node(Node &node, copyop) :

_stateSet(copyop(node.getStateSet()),

It doesn't call the setStateSet method of osg::Node (or osg::Drawable). So the parent
list of the state set is not updated with the new node (drawable)."

Location:

OpenSceneGraph/trunk/src/osg

Files:

• Drawable.cpp (modified) (2 diffs)
• Node.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osg/Drawable.cpp

@@ -224 +224 @@
     Object(drawable,copyop),
     _parents(), // leave empty as parentList is managed by Geode
-    _stateset(copyop(drawable._stateset.get())),
     _initialBound(drawable._initialBound),
     _computeBoundCallback(drawable._computeBoundCallback),
@@ -241 +240 @@
     _drawCallback(drawable._drawCallback)
 {
+    setStateSet(copyop(drawable._stateset.get()));
 }
 

OpenSceneGraph/trunk/src/osg/Node.cpp

@@ -83 +83 @@
         _numChildrenWithOccluderNodes(0),
         _nodeMask(node._nodeMask), 
-        _descriptions(node._descriptions),
-        _stateset(copyop(node._stateset.get()))
-{
+        _descriptions(node._descriptions)
+{
+    setStateSet(copyop(node._stateset.get()));
 }