[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51485] trunk/blender/source/blender: enable bmesh decimator by default.

[Campbell Barton]

Revision: 51485
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51485
Author:   campbellbarton
Date:     2012-10-22 02:09:41 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
enable bmesh decimator by default.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_decimate.c
    trunk/blender/source/blender/makesrna/intern/rna_modifier.c
    trunk/blender/source/blender/modifiers/intern/MOD_decimate.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_decimate.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_decimate.c	2012-10-22 02:02:52 UTC (rev 51484)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_decimate.c	2012-10-22 02:09:41 UTC (rev 51485)
@@ -830,7 +830,7 @@
 		}
 
 #if 0
-		/* optional, update edges around the face fan */
+		/* optional, update edges around the vertex face fan */
 		{
 			BMIter liter;
 			BMLoop *l;

Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2012-10-22 02:02:52 UTC (rev 51484)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2012-10-22 02:09:41 UTC (rev 51485)
@@ -1115,7 +1115,7 @@
 	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");
 

Modified: trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_decimate.c	2012-10-22 02:02:52 UTC (rev 51484)
+++ trunk/blender/source/blender/modifiers/intern/MOD_decimate.c	2012-10-22 02:09:41 UTC (rev 51485)
@@ -49,11 +49,14 @@
 
 #include "BKE_tessmesh.h"
 
+// #define USE_TIMEIT
+
 /* testing only! - Campbell */
-// #define USE_DECIMATE_BMESH
-#include "PIL_time.h"
+#define USE_DECIMATE_BMESH
+#ifdef USE_TIMEIT
+#  include "PIL_time.h"
+#endif
 
-
 #ifdef WITH_MOD_DECIMATE
 #include "LOD_decimation.h"
 #endif
@@ -89,7 +92,9 @@
 	BMEditMesh *em;
 	BMesh *bm;
 
+#ifdef USE_TIMEIT
 	 TIMEIT_START(decim);
+#endif
 
 	if (dmd->percent == 1.0f) {
 		return dm;
@@ -111,7 +116,9 @@
 	BMEdit_Free(em);
 	MEM_freeN(em);
 
+#ifdef USE_TIMEIT
 	 TIMEIT_END(decim);
+#endif
 
 	return result;
 }