[pkg-fgfs-crew] r127 - in /simgear/trunk/simgear/scene/model: SGClipGroup.cxx SGClipGroup.hxx

[ovek at users.alioth.debian.org]

Author: ovek
Date: Thu Jul 21 00:36:33 2011
New Revision: 127

URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=127
Log:
Apply upstream commit 1ca1f6ad22b9f30035274f4758471466f18943c4
"Remove reference to osgUtil::RegisterRenderBinProxy"

Modified:
    simgear/trunk/simgear/scene/model/SGClipGroup.cxx
    simgear/trunk/simgear/scene/model/SGClipGroup.hxx

Modified: simgear/trunk/simgear/scene/model/SGClipGroup.cxx
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/simgear/scene/model/SGClipGroup.cxx?rev=127&op=diff
==============================================================================
--- simgear/trunk/simgear/scene/model/SGClipGroup.cxx (original)
+++ simgear/trunk/simgear/scene/model/SGClipGroup.cxx Thu Jul 21 00:36:33 2011
@@ -70,8 +70,18 @@
   osg::ref_ptr<osg::RefMatrix> mModelView;
 };
 
-osgUtil::RegisterRenderBinProxy
-SGClipGroup::clipBinProxy("ClipRenderBin", new SGClipGroup::ClipRenderBin);
+struct SGClipGroup::ClipBinRegistrar
+{
+    ClipBinRegistrar()
+    {
+        osgUtil::RenderBin
+            ::addRenderBinPrototype("ClipRenderBin",
+                                    new SGClipGroup::ClipRenderBin);
+    }
+    static ClipBinRegistrar registrar;
+};
+
+SGClipGroup::ClipBinRegistrar SGClipGroup::ClipBinRegistrar::registrar;
 
 class SGClipGroup::CullCallback : public osg::NodeCallback {
 public:

Modified: simgear/trunk/simgear/scene/model/SGClipGroup.hxx
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/simgear/scene/model/SGClipGroup.hxx?rev=127&op=diff
==============================================================================
--- simgear/trunk/simgear/scene/model/SGClipGroup.hxx (original)
+++ simgear/trunk/simgear/scene/model/SGClipGroup.hxx Thu Jul 21 00:36:33 2011
@@ -49,10 +49,8 @@
 protected:
   class CullCallback;
   class ClipRenderBin;
-
+  struct ClipBinRegistrar;
   std::vector<osg::ref_ptr<osg::ClipPlane> > mClipPlanes;
-
-  static osgUtil::RegisterRenderBinProxy clipBinProxy;
 };
 
 #endif