[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52198] trunk/blender/source/blender/ editors: each different remove doubles function used a different property name, use 'threshold' for all now.

[Campbell Barton]

Revision: 52198
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52198
Author:   campbellbarton
Date:     2012-11-14 03:13:51 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
each different remove doubles function used a different property name, use 'threshold'  for all now.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c
    trunk/blender/source/blender/editors/physics/particle_edit.c
    trunk/blender/source/blender/editors/uvedit/uvedit_ops.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-11-14 02:58:43 UTC (rev 52197)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-11-14 03:13:51 UTC (rev 52198)
@@ -2183,7 +2183,7 @@
 	Object *obedit = CTX_data_edit_object(C);
 	BMEditMesh *em = BMEdit_FromObject(obedit);
 	BMOperator bmop;
-	const float mergedist = RNA_float_get(op->ptr, "mergedist");
+	const float threshold = RNA_float_get(op->ptr, "threshold");
 	int use_unselected = RNA_boolean_get(op->ptr, "use_unselected");
 	int totvert_orig = em->bm->totvert;
 	int count;
@@ -2191,7 +2191,7 @@
 	if (use_unselected) {
 		EDBM_op_init(em, &bmop, op,
 		             "automerge verts=%hv dist=%f",
-		             BM_ELEM_SELECT, mergedist);
+		             BM_ELEM_SELECT, threshold);
 		BMO_op_exec(em->bm, &bmop);
 
 		if (!EDBM_op_finish(em, &bmop, op, TRUE)) {
@@ -2201,7 +2201,7 @@
 	else {
 		EDBM_op_init(em, &bmop, op,
 		             "find_doubles verts=%hv dist=%f",
-		             BM_ELEM_SELECT, mergedist);
+		             BM_ELEM_SELECT, threshold);
 		BMO_op_exec(em->bm, &bmop);
 
 		if (!EDBM_op_callf(em, op, "weld_verts targetmap=%s", &bmop, "targetmapout")) {
@@ -2236,8 +2236,7 @@
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-	RNA_def_float(ot->srna, "mergedist", 0.0001f, 0.000001f, 50.0f, 
-	              "Merge Distance",
+	RNA_def_float(ot->srna, "threshold", 0.0001f, 0.000001f, 50.0f,  "Merge Distance",
 	              "Minimum distance between elements to merge", 0.00001, 10.0);
 	RNA_def_boolean(ot->srna, "use_unselected", 0, "Unselected", "Merge selected to other unselected vertices");
 }

Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c	2012-11-14 02:58:43 UTC (rev 52197)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c	2012-11-14 03:13:51 UTC (rev 52198)
@@ -2437,7 +2437,8 @@
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* properties */
-	RNA_def_float(ot->srna, "threshold", 0.0002f, 0.0f, FLT_MAX, "Threshold", "Threshold distance withing which particles are removed", 0.00001f, 0.1f);
+	RNA_def_float(ot->srna, "threshold", 0.0002f, 0.0f, FLT_MAX,
+	              "Merge Distance", "Threshold distance withing which particles are removed", 0.00001f, 0.1f);
 }
 
 

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2012-11-14 02:58:43 UTC (rev 52197)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2012-11-14 03:13:51 UTC (rev 52198)
@@ -1562,6 +1562,8 @@
 
 static int remove_doubles_exec(bContext *C, wmOperator *op)
 {
+	const float threshold = RNA_float_get(op->ptr, "threshold");
+
 	SpaceImage *sima;
 	Scene *scene;
 	Object *obedit;
@@ -1572,7 +1574,6 @@
 	int uv_b_index;
 	float *uv_a;
 	float *uv_b;
-	float weld_dist;
 	MLoopUV **loop_arr = NULL;
 	BLI_array_declare(loop_arr);
 
@@ -1588,9 +1589,6 @@
 	em = BMEdit_FromObject(obedit);
 	ima = CTX_data_edit_image(C);
 
-	weld_dist = RNA_float_get(op->ptr, "weld_dist");
-
-
 	BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
 		tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
 		if (!uvedit_face_visible_test(scene, ima, efa, tf))
@@ -1625,7 +1623,7 @@
 			for (uv_b_index = uv_a_index + 1; uv_b_index < BLI_array_count(vert_arr); uv_b_index++) {
 				uv_b = vert_arr[uv_b_index].uv_loop->uv;
 				if ((vert_arr[uv_b_index].weld == FALSE) &&
-				    (len_manhattan_v2v2(uv_a, uv_b) < weld_dist))
+				    (len_manhattan_v2v2(uv_a, uv_b) < threshold))
 				{
 					minmax_v2v2_v2(uv_max, uv_min, uv_b);
 					BLI_array_append(loop_arr, vert_arr[uv_b_index].uv_loop);
@@ -1663,7 +1661,8 @@
 	ot->exec = remove_doubles_exec;
 	ot->poll = ED_operator_uvedit;
 
-	RNA_def_float(ot->srna, "weld_dist", 0.02f, 0.0f, 10.0f, "Weld Distance", "Maximum distance between welded vertices", 0.0f, 1.0f);
+	RNA_def_float(ot->srna, "threshold", 0.02f, 0.0f, 10.0f,
+	              "Merge Distance", "Maximum distance between welded vertices", 0.0f, 1.0f);
 }
 /* ******************** weld operator **************** */