move decimator into tools/ dir
authorCampbell Barton <ideasman42@gmail.com>
Sun, 18 Nov 2012 08:16:09 +0000 (08:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 18 Nov 2012 08:16:09 +0000 (08:16 +0000)
source/blender/bmesh/CMakeLists.txt
source/blender/bmesh/bmesh.h
source/blender/bmesh/tools/bmesh_decimate.h [moved from source/blender/bmesh/intern/bmesh_decimate.h with 100% similarity]
source/blender/bmesh/tools/bmesh_decimate_collapse.c [moved from source/blender/bmesh/intern/bmesh_decimate_collapse.c with 99% similarity]
source/blender/bmesh/tools/bmesh_decimate_dissolve.c [moved from source/blender/bmesh/intern/bmesh_decimate_dissolve.c with 100% similarity]
source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c [moved from source/blender/bmesh/intern/bmesh_decimate_unsubdivide.c with 100% similarity]

index d7858ebbc0d04e20f8e9cb4b85aa577ce69da6c5..75f424010ae2e3fef4cb0683634817d578b77379 100644 (file)
@@ -68,10 +68,6 @@ set(SRC
        intern/bmesh_construct.h
        intern/bmesh_core.c
        intern/bmesh_core.h
-       intern/bmesh_decimate_collapse.c
-       intern/bmesh_decimate_dissolve.c
-       intern/bmesh_decimate_unsubdivide.c
-       intern/bmesh_decimate.h
        intern/bmesh_inline.h
        intern/bmesh_interp.c
        intern/bmesh_interp.h
@@ -109,6 +105,10 @@ set(SRC
        intern/bmesh_error.h
 
        tools/BME_bevel.c
+       tools/bmesh_decimate_collapse.c
+       tools/bmesh_decimate_dissolve.c
+       tools/bmesh_decimate_unsubdivide.c
+       tools/bmesh_decimate.h
 
        bmesh.h
        bmesh_class.h
index a672ec0b6a71f579d209e07bb125dee5568b6c36..54f55833664e205ab68fdeb4199c87b6ee31aa3e 100644 (file)
@@ -252,7 +252,6 @@ extern "C" {
 
 #include "intern/bmesh_construct.h"
 #include "intern/bmesh_core.h"
-#include "intern/bmesh_decimate.h"
 #include "intern/bmesh_interp.h"
 #include "intern/bmesh_iterators.h"
 #include "intern/bmesh_marking.h"
@@ -267,6 +266,8 @@ extern "C" {
 
 #include "intern/bmesh_inline.h"
 
+#include "tools/bmesh_decimate.h"
+
 #ifdef __cplusplus
 }
 #endif
similarity index 99%
rename from source/blender/bmesh/intern/bmesh_decimate_collapse.c
rename to source/blender/bmesh/tools/bmesh_decimate_collapse.c
index 74792d1d558132f4e9d71416320bf29d77e4cd62..c38b9f54a335c793c6d25cf6367b7eaa5861b096 100644 (file)
 #include "BKE_customdata.h"
 
 #include "bmesh.h"
-#include "bmesh_structure.h"
 #include "bmesh_decimate.h"  /* own include */
 
+#include "../intern/bmesh_structure.h"
+
 /* defines for testing */
 #define USE_CUSTOMDATA
 #define USE_TRIANGULATE