[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56150] trunk/blender/source/blender: fix for problem with too low epsilon when calculating thickness, also increase limits.

[Campbell Barton]

Revision: 56150
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56150
Author:   campbellbarton
Date:     2013-04-18 17:23:02 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
fix for problem with too low epsilon when calculating thickness, also increase limits.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2013-04-18 17:09:56 UTC (rev 56149)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2013-04-18 17:23:02 UTC (rev 56150)
@@ -45,6 +45,7 @@
 
 #include "BLI_math.h"
 #include "BLI_jitter.h"
+#include "BLI_bitmap.h"
 
 #include "BKE_cdderivedmesh.h"
 #include "BKE_mesh.h"
@@ -1622,7 +1623,7 @@
         /* result */
         unsigned char (*r_face_colors)[4])
 {
-	const float eps_offset = FLT_EPSILON * 10.0f;
+	const float eps_offset = 0.00001f;
 	float *face_dists = (float *)r_face_colors;  /* cheating */
 	const bool use_jit = samples < 32;
 	float jit_ofs[32][2];
@@ -1984,7 +1985,6 @@
 /* -------------------------------------------------------------------- */
 /* Editmesh Vert Coords */
 
-#include "BLI_bitmap.h"
 struct CageUserData {
 	int totvert;
 	float (*cos_cage)[3];

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-04-18 17:09:56 UTC (rev 56149)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-04-18 17:23:02 UTC (rev 56150)
@@ -2051,16 +2051,16 @@
 	prop = RNA_def_property(srna, "thickness_min", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_float_sdna(prop, NULL, "thickness_min");
 	RNA_def_property_float_default(prop, 0.5f);
-	RNA_def_property_range(prop, 0.0f, 100.0);
-	RNA_def_property_ui_range(prop, 0.0f, 10.0, 0.001, 3);
+	RNA_def_property_range(prop, 0.0f, 1000.0);
+	RNA_def_property_ui_range(prop, 0.0f, 100.0, 0.001, 3);
 	RNA_def_property_ui_text(prop, "Thickness Min", "Minimum for measuring thickness");
 	RNA_def_property_update(prop, 0, "rna_EditMesh_update");
 
 	prop = RNA_def_property(srna, "thickness_max", PROP_FLOAT, PROP_DISTANCE);
 	RNA_def_property_float_sdna(prop, NULL, "thickness_max");
 	RNA_def_property_float_default(prop, 0.5f);
-	RNA_def_property_range(prop, 0.0f, 100.0);
-	RNA_def_property_ui_range(prop, 0.0f, 10.0, 0.001, 3);
+	RNA_def_property_range(prop, 0.0f, 1000.0);
+	RNA_def_property_ui_range(prop, 0.0f, 100.0, 0.001, 3);
 	RNA_def_property_ui_text(prop, "Thickness Max", "Maximum for measuring thickness");
 	RNA_def_property_update(prop, 0, "rna_EditMesh_update");