archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

don't show screen-space-line start/end points in operator redo panel.

Browse Source
This commit is contained in:
Campbell Barton
2013-08-29 19:02:07 +00:00
parent 07994d6f50
commit 02773c7f28
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/mesh/editmesh_bisect.c
View File

@@ -151,8 +151,7 @@ static int mesh_bisect_modal(bContext *C, wmOperator *op, const wmEvent *event)
ret = WM_gesture_straightline_modal(C, op, event); ret = WM_gesture_straightline_modal(C, op, event);
if (ret & (OPERATOR_FINISHED | OPERATOR_CANCELLED)) { if (ret & (OPERATOR_FINISHED | OPERATOR_CANCELLED)) {
if (opdata) edbm_bisect_exit(C, &opdata_back);
edbm_bisect_exit(C, &opdata_back);
} }
return ret; return ret;

30
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -1137,10 +1137,16 @@ void WM_operator_properties_select_all(wmOperatorType *ot)
void WM_operator_properties_border(wmOperatorType *ot) void WM_operator_properties_border(wmOperatorType *ot)
{ {
RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX); PropertyRNA *prop;
RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX); prop = RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX);
RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX); RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
prop = RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
prop = RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
prop = RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
} }
void WM_operator_properties_border_to_rcti(struct wmOperator *op, rcti *rect) void WM_operator_properties_border_to_rcti(struct wmOperator *op, rcti *rect)
@@ -1171,14 +1177,18 @@ void WM_operator_properties_mouse_select(wmOperatorType *ot)
void WM_operator_properties_gesture_straightline(wmOperatorType *ot, int cursor) void WM_operator_properties_gesture_straightline(wmOperatorType *ot, int cursor)
{ {
RNA_def_int(ot->srna, "xstart", 0, INT_MIN, INT_MAX, "X Start", "", INT_MIN, INT_MAX); PropertyRNA *prop;
RNA_def_int(ot->srna, "xend", 0, INT_MIN, INT_MAX, "X End", "", INT_MIN, INT_MAX);
RNA_def_int(ot->srna, "ystart", 0, INT_MIN, INT_MAX, "Y Start", "", INT_MIN, INT_MAX); prop = RNA_def_int(ot->srna, "xstart", 0, INT_MIN, INT_MAX, "X Start", "", INT_MIN, INT_MAX);
RNA_def_int(ot->srna, "yend", 0, INT_MIN, INT_MAX, "Y End", "", INT_MIN, INT_MAX); RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
prop = RNA_def_int(ot->srna, "xend", 0, INT_MIN, INT_MAX, "X End", "", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
prop = RNA_def_int(ot->srna, "ystart", 0, INT_MIN, INT_MAX, "Y Start", "", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
prop = RNA_def_int(ot->srna, "yend", 0, INT_MIN, INT_MAX, "Y End", "", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
if (cursor) { if (cursor) {
PropertyRNA *prop;
prop = RNA_def_int(ot->srna, "cursor", cursor, 0, INT_MAX, prop = RNA_def_int(ot->srna, "cursor", cursor, 0, INT_MAX,
"Cursor", "Mouse cursor style to use during the modal operator", 0, INT_MAX); "Cursor", "Mouse cursor style to use during the modal operator", 0, INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN); RNA_def_property_flag(prop, PROP_HIDDEN);