[Bf-blender-cvs] [0f5ca75] blender-v2.77-release: Fix T47969: Select Random always uses same seed
Campbell Barton
noreply at git.blender.org
Tue Apr 5 10:38:31 CEST 2016
Commit: 0f5ca755fc0056341cbbe74f87cc2dce9fb4f299
Author: Campbell Barton
Date: Tue Mar 29 01:20:45 2016 +1100
Branches: blender-v2.77-release
https://developer.blender.org/rB0f5ca755fc0056341cbbe74f87cc2dce9fb4f299
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.
===================================================================
M source/blender/editors/curve/editcurve_select.c
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/metaball/mball_edit.c
M source/blender/editors/object/object_lattice.c
M source/blender/editors/object/object_select.c
M source/blender/editors/physics/particle_edit.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_operator_props.c
===================================================================
diff --git a/source/blender/editors/curve/editcurve_select.c b/source/blender/editors/curve/editcurve_select.c
index 4855f9d..a292662 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 83a1cdb..17250fb 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 f05414f..ed5bf4a 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 5724e54..73ce1fa 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 6b2c2bc..0cbbe46 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 277189b..29824a3 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;
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 0acd181..7692afe 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -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;
diff --git a/source/blender/windowmanager/intern/wm_operator_props.c b/source/blender/windowmanager/intern/wm_operator_props.c
index 78d3dde..7ec2aea 100644
--- a/source/blender/windowmanager/intern/wm_operator_props.c
+++ b/source/blender/windowmanager/intern/wm_operator_props.c
@@ -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);
More information about the Bf-blender-cvs
mailing list