[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47103] trunk/blender/source/blender: move mouse select options into their own property function - more operators should use these eventually
Campbell Barton
ideasman42 at gmail.com
Mon May 28 07:45:19 CEST 2012
Revision: 47103
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47103
Author: campbellbarton
Date: 2012-05-28 05:45:19 +0000 (Mon, 28 May 2012)
Log Message:
-----------
move mouse select options into their own property function - more operators should use these eventually
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2012-05-28 05:37:16 UTC (rev 47102)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2012-05-28 05:45:19 UTC (rev 47103)
@@ -2152,9 +2152,8 @@
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)");
Modified: trunk/blender/source/blender/windowmanager/WM_api.h
===================================================================
--- trunk/blender/source/blender/windowmanager/WM_api.h 2012-05-28 05:37:16 UTC (rev 47102)
+++ trunk/blender/source/blender/windowmanager/WM_api.h 2012-05-28 05:45:19 UTC (rev 47103)
@@ -209,6 +209,7 @@
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);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c 2012-05-28 05:37:16 UTC (rev 47102)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c 2012-05-28 05:45:19 UTC (rev 47103)
@@ -918,6 +918,13 @@
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);
More information about the Bf-blender-cvs
mailing list