[Bf-blender-cvs] [4e14437cb0a] blender2.8: Multi-Object-Mode: EditCurve Select Random

Campbell Barton noreply at git.blender.org
Tue May 22 08:26:17 CEST 2018


Commit: 4e14437cb0ab4beb3a4d4206ac0330a311cbb4c7
Author: Campbell Barton
Date:   Tue May 22 08:25:05 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB4e14437cb0ab4beb3a4d4206ac0330a311cbb4c7

Multi-Object-Mode: EditCurve Select Random

D3405 by @dgriffin91

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

M	source/blender/editors/curve/editcurve_select.c

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

diff --git a/source/blender/editors/curve/editcurve_select.c b/source/blender/editors/curve/editcurve_select.c
index 1719fd5568a..3b2865e91c3 100644
--- a/source/blender/editors/curve/editcurve_select.c
+++ b/source/blender/editors/curve/editcurve_select.c
@@ -1055,17 +1055,31 @@ static void curve_select_random(ListBase *editnurb, float randfac, int seed, boo
 
 static int curve_select_random_exec(bContext *C, wmOperator *op)
 {
-	Object *obedit = CTX_data_edit_object(C);
-	ListBase *editnurb = object_editcurve_get(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);
 
-	curve_select_random(editnurb, randfac, seed, select);
-	BKE_curve_nurb_vert_active_validate(obedit->data);
+	ViewLayer *view_layer = CTX_data_view_layer(C);
+	uint objects_len = 0;
+	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-	WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		ListBase *editnurb = object_editcurve_get(obedit);
+		int seed_iter = seed;
 
+		/* This gives a consistent result regardless of object order. */
+		if (ob_index) {
+			seed_iter += BLI_ghashutil_strhash_p(obedit->id.name);
+		}
+
+		curve_select_random(editnurb, randfac, seed_iter, select);
+		BKE_curve_nurb_vert_active_validate(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