[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25008] trunk/blender: 1.
Martin Poirier
theeth at yahoo.com
Sun Nov 29 23:16:29 CET 2009
Revision: 25008
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25008
Author: theeth
Date: 2009-11-29 23:16:29 +0100 (Sun, 29 Nov 2009)
Log Message:
-----------
1. Extend option for 3d view border select now does something (default True to keep same behavior)
2. Add action parameter to Select_All_Toggle operators, rename to Select_All.
Options are Toggle (default), Select, Deselect, Invert (same as select swap). This makes it possible to map separate hotkeys for select all and deselect all.
NOTE for Aligorith: I didn't change animation operators for select_all which already had an Invert operator. These should be fixed eventually.
Modified Paths:
--------------
trunk/blender/release/scripts/io/import_anim_bvh.py
trunk/blender/release/scripts/io/import_scene_obj.py
trunk/blender/release/scripts/ui/space_image.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/armature/armature_intern.h
trunk/blender/source/blender/editors/armature/armature_ops.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/curve/curve_intern.h
trunk/blender/source/blender/editors/curve/curve_ops.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/include/ED_curve.h
trunk/blender/source/blender/editors/include/ED_mesh.h
trunk/blender/source/blender/editors/include/ED_object.h
trunk/blender/source/blender/editors/include/ED_particle.h
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/mesh/mesh_intern.h
trunk/blender/source/blender/editors/mesh/mesh_ops.c
trunk/blender/source/blender/editors/metaball/mball_edit.c
trunk/blender/source/blender/editors/metaball/mball_intern.h
trunk/blender/source/blender/editors/metaball/mball_ops.c
trunk/blender/source/blender/editors/object/object_intern.h
trunk/blender/source/blender/editors/object/object_lattice.c
trunk/blender/source/blender/editors/object/object_ops.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/physics/physics_intern.h
trunk/blender/source/blender/editors/physics/physics_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/release/scripts/io/import_anim_bvh.py
===================================================================
--- trunk/blender/release/scripts/io/import_anim_bvh.py 2009-11-29 19:16:52 UTC (rev 25007)
+++ trunk/blender/release/scripts/io/import_anim_bvh.py 2009-11-29 22:16:29 UTC (rev 25008)
@@ -399,7 +399,7 @@
#XXX - sloppy operator code
bpy.ops.armature.delete()
- bpy.ops.armature.select_all_toggle()
+ bpy.ops.armature.select_all()
bpy.ops.armature.delete()
ZERO_AREA_BONES= []
@@ -484,7 +484,7 @@
pass
- bpy.ops.pose.select_all_toggle() # set
+ bpy.ops.pose.select_all() # set
bpy.ops.anim.keyframe_insert_menu(type=-4) # XXX - -4 ???
Modified: trunk/blender/release/scripts/io/import_scene_obj.py
===================================================================
--- trunk/blender/release/scripts/io/import_scene_obj.py 2009-11-29 19:16:52 UTC (rev 25007)
+++ trunk/blender/release/scripts/io/import_scene_obj.py 2009-11-29 22:16:29 UTC (rev 25008)
@@ -1277,7 +1277,7 @@
# deselect all
# if context.selected_objects:
-# bpy.ops.OBJECT_OT_select_all_toggle()
+# bpy.ops.OBJECT_OT_select_all()
scene = context.scene
# scn = bpy.data.scenes.active
@@ -1640,5 +1640,5 @@
# search image in bpy.config.textureDir - load_image
# replaced BPyImage.comprehensiveImageLoad with a simplified version that only checks additional directory specified, but doesn't search dirs recursively (obj_image_load)
# bitmask won't work? - 132
-# uses operator bpy.ops.OBJECT_OT_select_all_toggle() to deselect all (not necessary?)
+# uses operator bpy.ops.OBJECT_OT_select_all() to deselect all (not necessary?)
# uses bpy.sys.time()
Modified: trunk/blender/release/scripts/ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/ui/space_image.py 2009-11-29 19:16:52 UTC (rev 25007)
+++ trunk/blender/release/scripts/ui/space_image.py 2009-11-29 22:16:29 UTC (rev 25008)
@@ -75,7 +75,7 @@
layout.separator()
- layout.operator("uv.select_all_toggle")
+ layout.operator("uv.select_all")
layout.operator("uv.select_inverse")
layout.operator("uv.unlink_selection")
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2009-11-29 19:16:52 UTC (rev 25007)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2009-11-29 22:16:29 UTC (rev 25008)
@@ -364,7 +364,7 @@
layout.separator()
- layout.operator("object.select_all_toggle", text="Select/Deselect All")
+ layout.operator("object.select_all", text="Select/Deselect All")
layout.operator("object.select_inverse", text="Inverse")
layout.operator("object.select_random", text="Random")
layout.operator("object.select_mirror", text="Mirror")
@@ -388,7 +388,7 @@
layout.separator()
- layout.operator("pose.select_all_toggle", text="Select/Deselect All")
+ layout.operator("pose.select_all", text="Select/Deselect All")
layout.operator("pose.select_inverse", text="Inverse")
layout.operator("pose.select_constraint_target", text="Constraint Target")
layout.operator("pose.select_linked", text="Linked")
@@ -419,7 +419,7 @@
layout.separator()
- layout.operator("particle.select_all_toggle", text="Select/Deselect All")
+ layout.operator("particle.select_all", text="Select/Deselect All")
layout.operator("particle.select_linked")
layout.operator("particle.select_inverse")
@@ -445,7 +445,7 @@
layout.separator()
- layout.operator("mesh.select_all_toggle", text="Select/Deselect All")
+ layout.operator("mesh.select_all", text="Select/Deselect All")
layout.operator("mesh.select_inverse", text="Inverse")
layout.separator()
@@ -494,7 +494,7 @@
layout.separator()
- layout.operator("curve.select_all_toggle", text="Select/Deselect All")
+ layout.operator("curve.select_all", text="Select/Deselect All")
layout.operator("curve.select_inverse")
layout.operator("curve.select_random")
layout.operator("curve.select_every_nth")
@@ -523,7 +523,7 @@
layout.separator()
- layout.operator("curve.select_all_toggle", text="Select/Deselect All")
+ layout.operator("curve.select_all", text="Select/Deselect All")
layout.operator("curve.select_inverse")
layout.operator("curve.select_random")
layout.operator("curve.select_every_nth")
@@ -566,7 +566,7 @@
layout.separator()
- layout.operator("lattice.select_all_toggle", text="Select/Deselect All")
+ layout.operator("lattice.select_all", text="Select/Deselect All")
class VIEW3D_MT_select_edit_armature(bpy.types.Menu):
@@ -580,7 +580,7 @@
layout.separator()
- layout.operator("armature.select_all_toggle", text="Select/Deselect All")
+ layout.operator("armature.select_all", text="Select/Deselect All")
layout.operator("armature.select_inverse", text="Inverse")
layout.separator()
Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c 2009-11-29 19:16:52 UTC (rev 25007)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c 2009-11-29 22:16:29 UTC (rev 25008)
@@ -878,27 +878,37 @@
{
ListBase *markers= context_get_markers(C);
TimeMarker *marker;
- int select= RNA_int_get(op->ptr, "select_type");
+ int action = RNA_enum_get(op->ptr, "action");
if(markers == NULL)
return OPERATOR_CANCELLED;
-
- if(RNA_boolean_get(op->ptr, "select_swap")) {
+
+ if (action == SEL_TOGGLE) {
+ action = SEL_SELECT;
for(marker= markers->first; marker; marker= marker->next) {
- if(marker->flag & SELECT)
+ if(marker->flag & SELECT) {
+ action = SEL_DESELECT;
break;
+ }
}
- if(marker)
- select= 0;
- else
- select= 1;
}
for(marker= markers->first; marker; marker= marker->next) {
- if(select)
+ switch (action) {
+ case SEL_SELECT:
marker->flag |= SELECT;
- else
+ break;
+ case SEL_DESELECT:
marker->flag &= ~SELECT;
+ break;
+ case SEL_INVERT:
+ if (marker->flag & SELECT) {
+ marker->flag &= ~SELECT;
+ } else {
+ marker->flag |= SELECT;
+ }
+ break;
+ }
}
WM_event_add_notifier(C, NC_SCENE|ND_MARKERS, NULL);
@@ -906,31 +916,22 @@
return OPERATOR_FINISHED;
}
-static int ed_marker_select_all_invoke(bContext *C, wmOperator *op, wmEvent *evt)
+static void MARKER_OT_select_all(wmOperatorType *ot)
{
- RNA_boolean_set(op->ptr, "select_swap", 1);
-
- return ed_marker_select_all_exec(C, op);
-}
-
-static void MARKER_OT_select_all_toggle(wmOperatorType *ot)
-{
/* identifiers */
ot->name= "(De)select all markers";
- ot->description= "(de)select all time markers.";
- ot->idname= "MARKER_OT_select_all_toggle";
+ ot->description= "Change selection of all time markers.";
+ ot->idname= "MARKER_OT_select_all";
/* api callbacks */
ot->exec= ed_marker_select_all_exec;
- ot->invoke= ed_marker_select_all_invoke;
ot->poll= ED_operator_areaactive;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* rna */
- RNA_def_boolean(ot->srna, "select_swap", 0, "Select Swap", "");
- RNA_def_int(ot->srna, "select_type", 0, INT_MIN, INT_MAX, "Select Type", "", INT_MIN, INT_MAX);
+ WM_operator_properties_select_all(ot);
}
/* ******************************* remove marker ***************** */
@@ -987,7 +988,7 @@
WM_operatortype_append(MARKER_OT_duplicate);
WM_operatortype_append(MARKER_OT_select);
WM_operatortype_append(MARKER_OT_select_border);
- WM_operatortype_append(MARKER_OT_select_all_toggle);
+ WM_operatortype_append(MARKER_OT_select_all);
WM_operatortype_append(MARKER_OT_delete);
}
@@ -1002,7 +1003,7 @@
WM_keymap_verify_item(keymap, "MARKER_OT_select", SELECTMOUSE, KM_PRESS, 0, 0);
RNA_boolean_set(WM_keymap_add_item(keymap, "MARKER_OT_select", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend", 1);
WM_keymap_verify_item(keymap, "MARKER_OT_select_border", BKEY, KM_PRESS, 0, 0);
- WM_keymap_verify_item(keymap, "MARKER_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0);
+ WM_keymap_verify_item(keymap, "MARKER_OT_select_all", AKEY, KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, "MARKER_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, "MARKER_OT_delete", DELKEY, KM_PRESS, 0, 0);
Modified: trunk/blender/source/blender/editors/armature/armature_intern.h
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_intern.h 2009-11-29 19:16:52 UTC (rev 25007)
+++ trunk/blender/source/blender/editors/armature/armature_intern.h 2009-11-29 22:16:29 UTC (rev 25008)
@@ -45,7 +45,7 @@
void ARMATURE_OT_parent_set(struct wmOperatorType *ot);
void ARMATURE_OT_parent_clear(struct wmOperatorType *ot);
-void ARMATURE_OT_select_all_toggle(struct wmOperatorType *ot);
+void ARMATURE_OT_select_all(struct wmOperatorType *ot);
void ARMATURE_OT_select_inverse(struct wmOperatorType *ot);
void ARMATURE_OT_select_hierarchy(struct wmOperatorType *ot);
void ARMATURE_OT_select_linked(struct wmOperatorType *ot);
@@ -80,7 +80,7 @@
void POSE_OT_copy(struct wmOperatorType *ot);
void POSE_OT_paste(struct wmOperatorType *ot);
-void POSE_OT_select_all_toggle(struct wmOperatorType *ot);
+void POSE_OT_select_all(struct wmOperatorType *ot);
void POSE_OT_select_inverse(struct wmOperatorType *ot);
void POSE_OT_select_parent(struct wmOperatorType *ot);
void POSE_OT_select_hierarchy(struct wmOperatorType *ot);
Modified: trunk/blender/source/blender/editors/armature/armature_ops.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_ops.c 2009-11-29 19:16:52 UTC (rev 25007)
+++ trunk/blender/source/blender/editors/armature/armature_ops.c 2009-11-29 22:16:29 UTC (rev 25008)
@@ -77,7 +77,7 @@
WM_operatortype_append(ARMATURE_OT_parent_set);
WM_operatortype_append(ARMATURE_OT_parent_clear);
- WM_operatortype_append(ARMATURE_OT_select_all_toggle);
+ WM_operatortype_append(ARMATURE_OT_select_all);
WM_operatortype_append(ARMATURE_OT_select_inverse);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list