Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-03-28 17:20:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-03-28 17:24:57 +0300
commit28ca3ebc5f81347cad53f9a8b946166f469fa7da (patch)
treefe1b6e72911e5d8a634f62c363d67d9bfc7f7f80 /source/blender/windowmanager
parentd336bb0765e8175e93e4f9d2c024e258a8c992e5 (diff)
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.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/WM_api.h1
-rw-r--r--source/blender/windowmanager/intern/wm_operator_props.c14
2 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 58ce7aa346d..db2547e4fbe 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 78d3dde7ba8..7ec2aea73e1 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);