Changed header guard back to original, and removed deprecated enum

2013-06-18 14:52:26 +00:00 · 2013-06-18 14:52:26 +00:00 · 635993038a
commit 635993038a
parent f5496ea3c5
2 changed files with 2 additions and 5 deletions
--- a/include/osg/Array
+++ b/include/osg/Array
@ -82,9 +82,6 @@ class OSG_EXPORT Array : public BufferData
            BIND_OFF=0,
            BIND_OVERALL=1,
            BIND_PER_PRIMITIVE_SET=2,
-#if defined(OSG_USE_DEPRECATED_GEOMETRY_METHODS)
-            BIND_PER_PRIMITIVE=3,
-#endif
            BIND_PER_VERTEX=4,
            BIND_INSTANCE_DIVISOR_0=6,
            BIND_INSTANCE_DIVISOR_1=BIND_INSTANCE_DIVISOR_0+1,
--- a/include/osg/Geometry
+++ b/include/osg/Geometry
@ -11,8 +11,8 @@
 * OpenSceneGraph Public License for more details.
 */

-#ifndef OSG_GEOMETRYNEW
-#define OSG_GEOMETRYNEW 1
+#ifndef OSG_GEOMETRY
+#define OSG_GEOMETRY 1

 #include <osg/Drawable>
 #include <osg/Vec2>