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:
authorBastien Montagne <montagne29@wanadoo.fr>2015-10-23 15:00:28 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-10-24 09:38:13 +0300
commitc4e1837e6a60632bca759284402e661342d48dc4 (patch)
tree20839d7fa101c2fe81c7a76ef14bfdee8f58dc07 /source/blender/editors/uvedit/uvedit_ops.c
parentfbca69c69afb370ddc5a0b52e10d9db61c025752 (diff)
Fix related to T46538: do not popup choice menu of mark/clear seam UV editor op invoke when prop is already set!
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_ops.c')
-rw-r--r--source/blender/editors/uvedit/uvedit_ops.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 728e3662ce6..3fc0b654b82 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -4195,6 +4195,10 @@ static int uv_mark_seam_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSE
uiPopupMenu *pup;
uiLayout *layout;
+ if (RNA_struct_property_is_set(op->ptr, "clear")) {
+ return uv_mark_seam_exec(C, op);
+ }
+
pup = UI_popup_menu_begin(C, IFACE_("Edges"), ICON_NONE);
layout = UI_popup_menu_layout(pup);