Merge branch 'ehofman/framebuffer'

[simgear.git] / simgear / scene / material / matmodel.hxx

diff --git a/simgear/scene/material/matmodel.hxx b/simgear/scene/material/matmodel.hxx
index 363efec2b1aa0665d9add5eedf08ecdb7dfb7cfb..3e7d84a973ce06ec265104e5d3be947ee62ac637 100644 (file)
--- a/simgear/scene/material/matmodel.hxx
+++ b/simgear/scene/material/matmodel.hxx
@@ -30,7 +30,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING      // Standard C++ string library
+#include <string>      // Standard C++ string library
 #include <vector>
 
 #include <osg/ref_ptr>
@@ -77,21 +77,12 @@ public:
     int get_model_count( SGPropertyNode *prop_root );
 
 
-    /**
-     * Get a specific variant model for the object.
-     *
-     * @param index The index of the model.
-     * @return The model.
-     */
-     osg::Node *get_model( int index, SGPropertyNode *prop_root );
-
-
     /**
      * Get a randomly-selected variant model for the object.
      *
      * @return A randomly select model from the variants.
      */
-    osg::Node *get_random_model( SGPropertyNode *prop_root );
+    osg::Node *get_random_model( SGPropertyNode *prop_root, mt seed );
 
 
     /**