From de1eb14f8dd9cfc85411f954ea65eeec797cd94f Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 18 Jun 2013 17:48:43 +0000
Subject: [PATCH] Moved the Geometry::set*Binding to after the set*Array() to
 prevent problems when using the deprecated functionality.

---
 src/osgPlugins/pfb/ConvertFromPerformer.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/osgPlugins/pfb/ConvertFromPerformer.cpp b/src/osgPlugins/pfb/ConvertFromPerformer.cpp
index 27e68719b..f4dcfdbbc 100644
--- a/src/osgPlugins/pfb/ConvertFromPerformer.cpp
+++ b/src/osgPlugins/pfb/ConvertFromPerformer.cpp
@@ -1,5 +1,7 @@
 // -*-c++-*-
 
+#define OSG_USE_DEPRECATED_GEOMETRY_METHODS 1
+
 #include "ConvertFromPerformer.h"
 
 #include <osg/Group>
@@ -715,8 +717,6 @@ osg::Drawable* ConvertFromPerformer::visitGeoSet(osg::Geode* osgGeode,pfGeoSet*
             // handle flat shaded skip of normals.
             int nn = nv-flat_shaded_skip_all_primitives;
 
-            // set the normal binding type.
-            geom->setNormalBinding(_gsetBindMap[bind]);
 
             if (ilist)
             {
@@ -736,6 +736,9 @@ osg::Drawable* ConvertFromPerformer::visitGeoSet(osg::Geode* osgGeode,pfGeoSet*
                 }
                 geom->setNormalArray(osg_norms);
 
+                // set the normal binding type.
+                geom->setNormalBinding(_gsetBindMap[bind]);
+
                 osg::UShortArray* osg_indices = new osg::UShortArray;
                 osg_indices->reserve(nv);
 
@@ -791,9 +794,6 @@ osg::Drawable* ConvertFromPerformer::visitGeoSet(osg::Geode* osgGeode,pfGeoSet*
                      bind == PFGS_PER_PRIM ? geoset->getNumPrims() :
                      bind == PFGS_PER_VERTEX ? nv : 0;
 
-            // set the normal binding type.
-            geom->setNormalBinding(_gsetBindMap[bind]);
-
             // calc the maximum num of vertex from the index list.
             int cc;
             if (ilist)
@@ -815,6 +815,9 @@ osg::Drawable* ConvertFromPerformer::visitGeoSet(osg::Geode* osgGeode,pfGeoSet*
             }
             geom->setNormalArray(osg_norms);
 
+            // set the normal binding type.
+            geom->setNormalBinding(_gsetBindMap[bind]);
+
             if(ilist)
             {
                 geom->setNormalIndices(new osg::UShortArray(nn,ilist));
@@ -836,9 +839,6 @@ osg::Drawable* ConvertFromPerformer::visitGeoSet(osg::Geode* osgGeode,pfGeoSet*
             // handle flat shaded skip of normals.
             int nn = nv-flat_shaded_skip_all_primitives;
 
-            // set the normal binding type.
-            geom->setColorBinding(_gsetBindMap[bind]);
-
             if (ilist)
             {
                 // calc the maximum num of vertex from the index list.
@@ -858,6 +858,10 @@ osg::Drawable* ConvertFromPerformer::visitGeoSet(osg::Geode* osgGeode,pfGeoSet*
                 }
                 geom->setColorArray(osg_colors);
 
+                // set the color binding type.
+                geom->setColorBinding(_gsetBindMap[bind]);
+
+
                 osg::UShortArray* osg_indices = new osg::UShortArray;
                 osg_indices->reserve(nv);