From 28ca3ebc5f81347cad53f9a8b946166f469fa7da Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 29 Mar 2016 01:20:45 +1100 Subject: Fix T47969: Select Random always uses same seed Increment the seed on each use, otherwise calling again selects the same order, unless you manually adjust the seed. --- source/blender/editors/curve/editcurve_select.c | 2 +- source/blender/editors/mesh/editmesh_select.c | 2 +- source/blender/editors/metaball/mball_edit.c | 2 +- source/blender/editors/object/object_lattice.c | 2 +- source/blender/editors/object/object_select.c | 2 +- source/blender/editors/physics/particle_edit.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/curve/editcurve_select.c b/source/blender/editors/curve/editcurve_select.c index 4855f9d1e6c..a29266294b4 100644 --- a/source/blender/editors/curve/editcurve_select.c +++ b/source/blender/editors/curve/editcurve_select.c @@ -1045,7 +1045,7 @@ static int curve_select_random_exec(bContext *C, wmOperator *op) 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 = RNA_int_get(op->ptr, "seed"); + 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); diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 83a1cdbedc6..17250fbfb09 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -3588,7 +3588,7 @@ static int edbm_select_random_exec(bContext *C, wmOperator *op) 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 = RNA_int_get(op->ptr, "seed"); + const int seed = WM_operator_properties_select_random_seed_increment_get(op); BMIter iter; diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index f05414fbfa6..ed5bf4a92b4 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -373,7 +373,7 @@ static int select_random_metaelems_exec(bContext *C, wmOperator *op) MetaElem *ml; 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 = RNA_int_get(op->ptr, "seed"); + const int seed = WM_operator_properties_select_random_seed_increment_get(op); RNG *rng = BLI_rng_new_srandom(seed); diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c index 5724e542f33..73ce1fae605 100644 --- a/source/blender/editors/object/object_lattice.c +++ b/source/blender/editors/object/object_lattice.c @@ -194,7 +194,7 @@ static int lattice_select_random_exec(bContext *C, wmOperator *op) 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 int seed = WM_operator_properties_select_random_seed_increment_get(op); const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT); RNG *rng = BLI_rng_new_srandom(seed); diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 6b2c2bcd173..0cbbe46f461 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -1297,7 +1297,7 @@ void OBJECT_OT_select_less(wmOperatorType *ot) static int object_select_random_exec(bContext *C, wmOperator *op) { const float randfac = RNA_float_get(op->ptr, "percent") / 100.0f; - const int seed = RNA_int_get(op->ptr, "seed"); + const int seed = WM_operator_properties_select_random_seed_increment_get(op); const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT); RNG *rng = BLI_rng_new_srandom(seed); diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 277189b4e81..29824a348f5 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -1635,7 +1635,7 @@ static int select_random_exec(bContext *C, wmOperator *op) int k; const float randfac = RNA_float_get (op->ptr, "percent") / 100.0f; - const int seed = RNA_int_get(op->ptr, "seed"); + const int seed = WM_operator_properties_select_random_seed_increment_get(op); const bool select = (RNA_enum_get(op->ptr, "action") == SEL_SELECT); RNG *rng; -- cgit v1.2.3