diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-10-10 15:47:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-10 15:52:11 +0300 |
commit | 05acf3d43a1d9655ee41d68470647d9409eaff40 (patch) | |
tree | 751802b51470d2225ec3442f031778553ba61482 /source/blender/editors/object | |
parent | 240f356166e70dc495b44a4628d36181c93ff1a0 (diff) |
Random Select Seed Option
Add 'Seed' option for all random select operators
D1508 by @mba105, w/ edits
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_lattice.c | 12 | ||||
-rw-r--r-- | source/blender/editors/object/object_select.c | 16 |
2 files changed, 17 insertions, 11 deletions
diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c index 76d9facf701..410b15581df 100644 --- a/source/blender/editors/object/object_lattice.c +++ b/source/blender/editors/object/object_lattice.c @@ -192,9 +192,13 @@ static int lattice_select_random_exec(bContext *C, wmOperator *op) { Object *obedit = CTX_data_edit_object(C); Lattice *lt = ((Lattice *)obedit->data)->editlatt->latt; + const float randfac = RNA_float_get(op->ptr, "percent") / 100.0f; + const int seed = RNA_int_get(op->ptr, "seed"); const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT); + RNG *rng = BLI_rng_new_srandom(seed); + int tot; BPoint *bp; @@ -202,7 +206,7 @@ static int lattice_select_random_exec(bContext *C, wmOperator *op) bp = lt->def; while (tot--) { if (!bp->hide) { - if (BLI_frand() < randfac) { + if (BLI_rng_get_float(rng) < randfac) { bpoint_select_set(bp, select); } } @@ -213,6 +217,8 @@ static int lattice_select_random_exec(bContext *C, wmOperator *op) lt->actbp = LT_ACTBP_NONE; } + BLI_rng_free(rng); + WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data); return OPERATOR_FINISHED; @@ -233,9 +239,7 @@ void LATTICE_OT_select_random(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* props */ - RNA_def_float_percentage(ot->srna, "percent", 50.f, 0.0f, 100.0f, - "Percent", "Percentage of elements to select randomly", 0.f, 100.0f); - WM_operator_properties_select_action_simple(ot, SEL_SELECT); + WM_operator_properties_select_random(ot); } diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index f69f76cbcc3..2f2eece8018 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -1179,19 +1179,22 @@ void OBJECT_OT_select_mirror(wmOperatorType *ot) static int object_select_random_exec(bContext *C, wmOperator *op) { - float percent; + const float randfac = RNA_float_get(op->ptr, "percent") / 100.0f; + const int seed = RNA_int_get(op->ptr, "seed"); const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT); - percent = RNA_float_get(op->ptr, "percent") / 100.0f; - + RNG *rng = BLI_rng_new_srandom(seed); + CTX_DATA_BEGIN (C, Base *, base, selectable_bases) { - if (BLI_frand() < percent) { + if (BLI_rng_get_float(rng) < randfac) { ED_base_object_select(base, select); } } CTX_DATA_END; - + + BLI_rng_free(rng); + WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, CTX_data_scene(C)); return OPERATOR_FINISHED; @@ -1213,6 +1216,5 @@ void OBJECT_OT_select_random(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* properties */ - RNA_def_float_percentage(ot->srna, "percent", 50.f, 0.0f, 100.0f, "Percent", "Percentage of objects to select randomly", 0.f, 100.0f); - WM_operator_properties_select_action_simple(ot, SEL_SELECT); + WM_operator_properties_select_random(ot); } |