bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix T47969: Select Random always uses same seed

Browse Source 
Increment the seed on each use,
otherwise calling again selects the same order, unless you manually adjust the seed.
This commit is contained in:
Campbell Barton 2016-03-29 01:20:45 +11:00
parent d336bb0765
commit 28ca3ebc5f
8 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/curve/editcurve_select.c
View File

@ -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);

2
source/blender/editors/mesh/editmesh_select.c
View File

@ -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;

2
source/blender/editors/metaball/mball_edit.c
View File

@ -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);

2
source/blender/editors/object/object_lattice.c
View File

@ -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);

2
source/blender/editors/object/object_select.c
View File

@ -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);

2
source/blender/editors/physics/particle_edit.c
View File

@ -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;

1
source/blender/windowmanager/WM_api.h
View File

@ -304,6 +304,7 @@ void WM_operator_properties_select_all(struct wmOperatorType *ot);
void WM_operator_properties_select_action(struct wmOperatorType *ot, int default_action);
void WM_operator_properties_select_action_simple(struct wmOperatorType *ot, int default_action);
void WM_operator_properties_select_random(struct wmOperatorType *ot);
int WM_operator_properties_select_random_seed_increment_get(wmOperator *op);
struct CheckerIntervalParams {
int nth; /* bypass when set to zero */
int skip;

14
source/blender/windowmanager/intern/wm_operator_props.c
View File

@ -174,6 +174,20 @@ void WM_operator_properties_select_random(wmOperatorType *ot)
WM_operator_properties_select_action_simple(ot, SEL_SELECT);
}
int WM_operator_properties_select_random_seed_increment_get(wmOperator *op)
{
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "seed");
int value = RNA_property_int_get(op->ptr, prop);
if (op->flag & OP_IS_INVOKE) {
if (!RNA_property_is_set(op->ptr, prop)) {
value += 1;
RNA_property_int_set(op->ptr, prop, value);
}
}
return value;
}
void WM_operator_properties_select_all(wmOperatorType *ot)
{
WM_operator_properties_select_action(ot, SEL_TOGGLE);