From 0220448af369f87c4a0c26658725f61f0f595dc7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 11 Aug 2006 16:03:04 +0000 Subject: [PATCH] Fixed value of FLATTEN_BILLBOARDS enum. --- include/osgUtil/Optimizer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/osgUtil/Optimizer b/include/osgUtil/Optimizer index 08a683912..aeb924abb 100644 --- a/include/osgUtil/Optimizer +++ b/include/osgUtil/Optimizer @@ -71,7 +71,6 @@ class OSGUTIL_EXPORT Optimizer REMOVE_LOADED_PROXY_NODES = 0x004, COMBINE_ADJACENT_LODS = 0x008, SHARE_DUPLICATE_STATE = 0x010, - MERGE_GEODES = 0x1000, MERGE_GEOMETRY = 0x020, CHECK_GEOMETRY = 0x040, SPATIALIZE_GROUPS = 0x080, @@ -79,7 +78,8 @@ class OSGUTIL_EXPORT Optimizer TRISTRIP_GEOMETRY = 0x200, TESSELATE_GEOMETRY = 0x400, OPTIMIZE_TEXTURE_SETTINGS = 0x800, - FLATTEN_BILLBOARDS = 0x1000, + MERGE_GEODES = 0x1000, + FLATTEN_BILLBOARDS = 0x2000, DEFAULT_OPTIMIZATIONS = FLATTEN_STATIC_TRANSFORMS | REMOVE_REDUNDANT_NODES | REMOVE_LOADED_PROXY_NODES |