enable bmesh decimator by default.

diff --git a/source/blender/bmesh/intern/bmesh_decimate.c b/source/blender/bmesh/intern/bmesh_decimate.c
index 600b67f2bb019f244e06e04299266974abb6fb8b..dbdd6008e8988504c8838f8d0e78137036f0f9e0 100644 (file)
--- a/source/blender/bmesh/intern/bmesh_decimate.c
+++ b/source/blender/bmesh/intern/bmesh_decimate.c
@@ -830,7 +830,7 @@ static void bm_decim_edge_collapse(BMesh *bm, BMEdge *e,
                }
 
 #if 0
-               /* optional, update edges around the face fan */
+               /* optional, update edges around the vertex face fan */
                {
                        BMIter liter;
                        BMLoop *l;

diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 8a8bb2a2384c35d062cfbb8524647ff02da3cf93..1fcf410768290c455ba05cb84527856a96e30dd0 100644 (file)
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -1115,7 +1115,7 @@ static void rna_def_modifier_decimate(BlenderRNA *brna)
        prop = RNA_def_property(srna, "ratio", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "percent");
        RNA_def_property_range(prop, 0, 1);
-       RNA_def_property_ui_range(prop, 0, 1, 1, 2);
+       RNA_def_property_ui_range(prop, 0, 1, 1, 4);
        RNA_def_property_ui_text(prop, "Ratio", "Ratio of triangles to reduce to");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 

diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index fefb3838eddb97d5e9b39b1cce25014085aa59c1..54c31148405e1e0eb1465487939bf6add5962c5d 100644 (file)
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -49,10 +49,13 @@
 
 #include "BKE_tessmesh.h"
 
-/* testing only! - Campbell */
-// #define USE_DECIMATE_BMESH
-#include "PIL_time.h"
+// #define USE_TIMEIT
 
+/* testing only! - Campbell */
+#define USE_DECIMATE_BMESH
+#ifdef USE_TIMEIT
+#  include "PIL_time.h"
+#endif
 
 #ifdef WITH_MOD_DECIMATE
 #include "LOD_decimation.h"
@@ -89,7 +92,9 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
        BMEditMesh *em;
        BMesh *bm;
 
+#ifdef USE_TIMEIT
         TIMEIT_START(decim);
+#endif
 
        if (dmd->percent == 1.0f) {
                return dm;
@@ -111,7 +116,9 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
        BMEdit_Free(em);
        MEM_freeN(em);
 
+#ifdef USE_TIMEIT
         TIMEIT_END(decim);
+#endif
 
        return result;
 }