[Bf-blender-cvs] [847f028b715] blender2.8: Multi-Object-Editing: select random by Jefferson Rausseo with changes

Dalai Felinto noreply at git.blender.org
Tue May 8 11:51:28 CEST 2018


Commit: 847f028b715f20aea1021220e18da1183f45c131
Author: Dalai Felinto
Date:   Tue May 8 11:36:09 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB847f028b715f20aea1021220e18da1183f45c131

Multi-Object-Editing: select random by Jefferson Rausseo with changes

Aside from identation, seed should change for each object. Otherwise to objects
with a copied mesh would get the exactly same "random" selection.

And we do so in a consistent way so it doesn't vary depending on
object order.

Seed bump using hash suggested by Campbell Barton and Sergey Sharybin.

Maniphest Tasks: T54643
Differential Revision: https://developer.blender.org/D3231

===================================================================

M	source/blender/editors/mesh/editmesh_select.c

===================================================================

diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 2c50f5ae189..09d20cdd6b9 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -3986,53 +3986,66 @@ void MESH_OT_select_non_manifold(wmOperatorType *ot)
 
 static int edbm_select_random_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT);
 	const float randfac =  RNA_float_get(op->ptr, "percent") / 100.0f;
 	const int seed = WM_operator_properties_select_random_seed_increment_get(op);
 
-	BMIter iter;
+	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	RNG *rng = BLI_rng_new_srandom(seed);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
+		BMIter iter;
+		int seed_iter = seed;
 
-	if (em->selectmode & SCE_SELECT_VERTEX) {
-		BMVert *eve;
-		BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
-			if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BLI_rng_get_float(rng) < randfac) {
-				BM_vert_select_set(em->bm, eve, select);
+		/* This gives a consistent result regardless of object order. */
+		if (ob_index) {
+			seed_iter += BLI_ghashutil_strhash_p(obedit->id.name);
+		}
+
+		RNG *rng = BLI_rng_new_srandom(seed_iter);
+
+		if (em->selectmode & SCE_SELECT_VERTEX) {
+			BMVert *eve;
+			BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
+				if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN) && BLI_rng_get_float(rng) < randfac) {
+					BM_vert_select_set(em->bm, eve, select);
+				}
 			}
 		}
-	}
-	else if (em->selectmode & SCE_SELECT_EDGE) {
-		BMEdge *eed;
-		BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
-			if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BLI_rng_get_float(rng) < randfac) {
-				BM_edge_select_set(em->bm, eed, select);
+		else if (em->selectmode & SCE_SELECT_EDGE) {
+			BMEdge *eed;
+			BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) {
+				if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN) && BLI_rng_get_float(rng) < randfac) {
+					BM_edge_select_set(em->bm, eed, select);
+				}
 			}
 		}
-	}
-	else {
-		BMFace *efa;
-		BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
-			if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BLI_rng_get_float(rng) < randfac) {
-				BM_face_select_set(em->bm, efa, select);
+		else {
+			BMFace *efa;
+			BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
+				if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN) && BLI_rng_get_float(rng) < randfac) {
+					BM_face_select_set(em->bm, efa, select);
+				}
 			}
 		}
-	}
 
-	BLI_rng_free(rng);
+		BLI_rng_free(rng);
 
-	if (select) {
-		/* was EDBM_select_flush, but it over select in edge/face mode */
-		EDBM_selectmode_flush(em);
-	}
-	else {
-		EDBM_deselect_flush(em);
-	}
+		if (select) {
+			/* was EDBM_select_flush, but it over select in edge/face mode */
+			EDBM_selectmode_flush(em);
+		}
+		else {
+			EDBM_deselect_flush(em);
+		}
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	}
 
+	MEM_freeN(objects);
 	return OPERATOR_FINISHED;
 }



More information about the Bf-blender-cvs mailing list