From 2e9676f2cb93e993e93c01df8ba24b282ea2eb2a Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 16 Dec 2003 08:56:49 +0000
Subject: [PATCH] Put the ordering of the callbacks so that the update callback
 is first, then cull then draw.  Added missing copy of update callback into
 copy constructor.

---
 include/osg/Drawable | 2 +-
 src/osg/Drawable.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/osg/Drawable b/include/osg/Drawable
index b366b614b..1f616f6f7 100644
--- a/include/osg/Drawable
+++ b/include/osg/Drawable
@@ -692,8 +692,8 @@ class SG_EXPORT Drawable : public Object
         mutable GLObjectList    _vboList;
 
         ref_ptr<UpdateCallback> _updateCallback;
-        ref_ptr<DrawCallback>   _drawCallback;
         ref_ptr<CullCallback>   _cullCallback;
+        ref_ptr<DrawCallback>   _drawCallback;
         
 
 };
diff --git a/src/osg/Drawable.cpp b/src/osg/Drawable.cpp
index 4e3a9fa2f..675db8560 100644
--- a/src/osg/Drawable.cpp
+++ b/src/osg/Drawable.cpp
@@ -154,8 +154,9 @@ Drawable::Drawable(const Drawable& drawable,const CopyOp& copyop):
     _useDisplayList(drawable._useDisplayList),
     _supportsVertexBufferObjects(drawable._supportsVertexBufferObjects),
     _useVertexBufferObjects(drawable._useVertexBufferObjects),
-    _drawCallback(drawable._drawCallback),
-    _cullCallback(drawable._cullCallback)
+    _updateCallback(drawable._updateCallback),
+    _cullCallback(drawable._cullCallback),
+    _drawCallback(drawable._drawCallback)
 {
 }