griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

svn merge ^/trunk/blender -r47099:47103

Browse Source
This commit is contained in:
Campbell Barton
2012-05-28 05:48:02 +00:00
parent 8fb7b4073e ee15754e31
commit dec31988a0
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/mask/mask_select.c
View File

@@ -307,9 +307,7 @@ void MASK_OT_select(wmOperatorType *ot)
ot->flag = OPTYPE_UNDO;
/* properties */
RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first");
RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Remove from selection");
RNA_def_boolean(ot->srna, "toggle", 0, "Toggle Selection", "Toggles selection");
WM_operator_properties_mouse_select(ot);
RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MIN, FLT_MAX,
"Location", "Location of vertex in normalized space", -1.0f, 1.0f);

5
source/blender/editors/space_view3d/view3d_select.c
View File

@@ -2152,9 +2152,8 @@ void VIEW3D_OT_select(wmOperatorType *ot)
ot->flag = OPTYPE_UNDO;
/* properties */
RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first");
RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Remove from selection");
RNA_def_boolean(ot->srna, "toggle", 0, "Toggle Selection", "Toggles selection");
WM_operator_properties_mouse_select(ot);
RNA_def_boolean(ot->srna, "center", 0, "Center", "Use the object center when selecting, in editmode used to extend object selection");
RNA_def_boolean(ot->srna, "enumerate", 0, "Enumerate", "List objects under the mouse (object mode only)");
RNA_def_boolean(ot->srna, "object", 0, "Object", "Use object selection (editmode only)");

1
source/blender/windowmanager/WM_api.h
View File

@@ -209,6 +209,7 @@ void WM_operator_properties_create_ptr(struct PointerRNA *ptr, struct wmOperato
void WM_operator_properties_free(struct PointerRNA *ptr);
void WM_operator_properties_filesel(struct wmOperatorType *ot, int filter, short type, short action, short flag, short display);
void WM_operator_properties_gesture_border(struct wmOperatorType *ot, int extend);
void WM_operator_properties_mouse_select(struct wmOperatorType *ot);
void WM_operator_properties_gesture_straightline(struct wmOperatorType *ot, int cursor);
void WM_operator_properties_select_all(struct wmOperatorType *ot);

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

@@ -918,6 +918,13 @@ void WM_operator_properties_gesture_border(wmOperatorType *ot, int extend)
RNA_def_boolean(ot->srna, "extend", 1, "Extend", "Extend selection instead of deselecting everything first");
}
void WM_operator_properties_mouse_select(wmOperatorType *ot)
{
RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend selection instead of deselecting everything first");
RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Remove from selection");
RNA_def_boolean(ot->srna, "toggle", 0, "Toggle Selection", "Toggles selection");
}
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);