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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-27 20:02:15 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-27 20:02:15 +0400
commitb43c022373a58b5d7214c526e2b474f01b40d692 (patch)
tree9313b747d91080ca84ac74ee4617b918b456bedb /source/blender/editors/object
parent5f8fded63943fd593f81203956968b97ec27c52c (diff)
Move to layer: remove the OK button and make it apply immediately like it did
before, is much nicer workflow. Now only if global undo is disabled will the OK button show. This is also a more generic fix for #26891 that solves other operators that were also broken with global undo disabled.
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_relations.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 6c3155deb17..f886b52e2ce 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -1225,7 +1225,7 @@ static unsigned int move_to_layer_init(bContext *C, wmOperator *op)
return lay;
}
-static int move_to_layer_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
+static int move_to_layer_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
View3D *v3d = CTX_wm_view3d(C);
if (v3d && v3d->localvd) {
@@ -1233,7 +1233,7 @@ static int move_to_layer_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve
}
else {
move_to_layer_init(C, op);
- return WM_operator_props_dialog_popup(C, op, 260, 30);
+ return WM_operator_props_popup(C, op, event);
}
}