[Bf-blender-cvs] [8c74462f188] blender2.8: Cleanup: move select all/none/invert into template
Campbell Barton
noreply at git.blender.org
Sun Sep 2 13:29:00 CEST 2018
Commit: 8c74462f188ccf0e71c167579c2fc4b5827e25cc
Author: Campbell Barton
Date: Sun Sep 2 21:21:15 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB8c74462f188ccf0e71c167579c2fc4b5827e25cc
Cleanup: move select all/none/invert into template
===================================================================
M build_files/cmake/macros.cmake
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_markers.c
M source/blender/editors/armature/armature_ops.c
M source/blender/editors/curve/curve_ops.c
M source/blender/editors/gpencil/gpencil_ops.c
A source/blender/editors/include/ED_keymap_templates.h
M source/blender/editors/lattice/lattice_ops.c
M source/blender/editors/mask/mask_edit.c
M source/blender/editors/mesh/mesh_ops.c
M source/blender/editors/metaball/mball_ops.c
M source/blender/editors/object/object_ops.c
M source/blender/editors/physics/physics_ops.c
M source/blender/editors/sculpt_paint/paint_ops.c
M source/blender/editors/space_action/action_ops.c
M source/blender/editors/space_clip/space_clip.c
M source/blender/editors/space_graph/graph_ops.c
M source/blender/editors/space_nla/nla_ops.c
M source/blender/editors/space_node/node_ops.c
M source/blender/editors/space_outliner/outliner_ops.c
M source/blender/editors/space_sequencer/sequencer_ops.c
M source/blender/editors/util/CMakeLists.txt
A source/blender/editors/util/keymap_templates.c
M source/blender/editors/uvedit/uvedit_ops.c
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index a4f8d9397aa..ddea41675c2 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -595,7 +595,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
bf_editor_space_clip
bf_editor_transform
- bf_editor_util
bf_editor_uvedit
bf_editor_curve
bf_editor_interface
@@ -616,6 +615,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
bf_editor_datafiles
bf_editor_mask
bf_editor_io
+ bf_editor_util
bf_render
bf_python
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 6032b21ab88..389a8d0fd03 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -65,6 +65,7 @@
#include "ED_anim_api.h"
#include "ED_armature.h"
#include "ED_keyframes_edit.h" // XXX move the select modes out of there!
+#include "ED_keymap_templates.h"
#include "ED_object.h"
#include "ED_screen.h"
#include "ED_select_utils.h"
@@ -3213,12 +3214,7 @@ void ED_keymap_animchannels(wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "ANIM_OT_channels_find", FKEY, KM_PRESS, KM_CTRL, 0);
/* deselect all */
- kmi = WM_keymap_add_item(keymap, "ANIM_OT_channels_select_all", AKEY, KM_PRESS, 0, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_SELECT);
- kmi = WM_keymap_add_item(keymap, "ANIM_OT_channels_select_all", AKEY, KM_PRESS, KM_ALT, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_DESELECT);
- kmi = WM_keymap_add_item(keymap, "ANIM_OT_channels_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
+ ED_keymap_template_select_all(keymap, "ANIM_OT_channels_select_all");
/* borderselect */
WM_keymap_add_item(keymap, "ANIM_OT_channels_select_border", BKEY, KM_PRESS, 0, 0);
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 2085ad869be..e0f9a546dfc 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -72,6 +72,7 @@
#include "ED_markers.h"
#include "ED_screen.h"
#include "ED_select_utils.h"
+#include "ED_keymap_templates.h"
#include "ED_util.h"
#include "ED_numinput.h"
#include "ED_object.h"
@@ -1672,10 +1673,7 @@ void ED_keymap_marker(wmKeyConfig *keyconf)
WM_keymap_verify_item(keymap, "MARKER_OT_select_border", BKEY, KM_PRESS, 0, 0);
- kmi = WM_keymap_verify_item(keymap, "MARKER_OT_select_all", AKEY, KM_PRESS, 0, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_SELECT);
- kmi = WM_keymap_verify_item(keymap, "MARKER_OT_select_all", AKEY, KM_PRESS, KM_ALT, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_DESELECT);
+ ED_keymap_template_select_all(keymap, "MARKER_OT_select_all");
WM_keymap_add_item(keymap, "MARKER_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "MARKER_OT_delete", DELKEY, KM_PRESS, 0, 0);
diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c
index 323fa36832b..f61018f5278 100644
--- a/source/blender/editors/armature/armature_ops.c
+++ b/source/blender/editors/armature/armature_ops.c
@@ -36,6 +36,7 @@
#include "ED_armature.h"
#include "ED_screen.h"
#include "ED_select_utils.h"
+#include "ED_keymap_templates.h"
#include "ED_transform.h"
#include "armature_intern.h"
@@ -218,12 +219,7 @@ void ED_keymap_armature(wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "ARMATURE_OT_parent_set", PKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "ARMATURE_OT_parent_clear", PKEY, KM_PRESS, KM_ALT, 0);
- kmi = WM_keymap_add_item(keymap, "ARMATURE_OT_select_all", AKEY, KM_PRESS, 0, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_SELECT);
- kmi = WM_keymap_add_item(keymap, "ARMATURE_OT_select_all", AKEY, KM_PRESS, KM_ALT, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_DESELECT);
- kmi = WM_keymap_add_item(keymap, "ARMATURE_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
+ ED_keymap_template_select_all(keymap, "ARMATURE_OT_select_all");
kmi = WM_keymap_add_item(keymap, "ARMATURE_OT_select_mirror", MKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
RNA_boolean_set(kmi->ptr, "extend", false);
@@ -334,12 +330,7 @@ void ED_keymap_armature(wmKeyConfig *keyconf)
RNA_boolean_set(kmi->ptr, "flipped", true);
#endif
- kmi = WM_keymap_add_item(keymap, "POSE_OT_select_all", AKEY, KM_PRESS, 0, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_SELECT);
- kmi = WM_keymap_add_item(keymap, "POSE_OT_select_all", AKEY, KM_PRESS, KM_ALT, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_DESELECT);
- kmi = WM_keymap_add_item(keymap, "POSE_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
+ ED_keymap_template_select_all(keymap, "POSE_OT_select_all");
WM_keymap_add_item(keymap, "POSE_OT_select_parent", PKEY, KM_PRESS, KM_SHIFT, 0);
diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c
index ae07196860b..1d84a1fe5e7 100644
--- a/source/blender/editors/curve/curve_ops.c
+++ b/source/blender/editors/curve/curve_ops.c
@@ -45,6 +45,7 @@
#include "ED_object.h"
#include "ED_screen.h"
#include "ED_select_utils.h"
+#include "ED_keymap_templates.h"
#include "ED_transform.h"
#include "curve_intern.h"
@@ -245,12 +246,7 @@ void ED_keymap_curve(wmKeyConfig *keyconf)
kmi = WM_keymap_add_item(keymap, "CURVE_OT_draw", TABLET_STYLUS, KM_PRESS, KM_SHIFT, 0);
RNA_boolean_set(kmi->ptr, "wait_for_input", false);
- kmi = WM_keymap_add_item(keymap, "CURVE_OT_select_all", AKEY, KM_PRESS, 0, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_SELECT);
- kmi = WM_keymap_add_item(keymap, "CURVE_OT_select_all", AKEY, KM_PRESS, KM_ALT, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_DESELECT);
- kmi = WM_keymap_add_item(keymap, "CURVE_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
+ ED_keymap_template_select_all(keymap, "CURVE_OT_select_all");
WM_keymap_add_item(keymap, "CURVE_OT_select_row", RKEY, KM_PRESS, KM_SHIFT, 0);
WM_keymap_add_item(keymap, "CURVE_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index fd6cf1f9681..db51fead531 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -51,6 +51,7 @@
#include "ED_gpencil.h"
#include "ED_select_utils.h"
+#include "ED_keymap_templates.h"
#include "ED_object.h"
#include "ED_transform.h"
@@ -197,13 +198,7 @@ static void ed_keymap_gpencil_selection(wmKeyMap *keymap)
wmKeyMapItem *kmi;
/* select all */
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_select_all", AKEY, KM_PRESS, 0, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_SELECT);
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_select_all", AKEY, KM_PRESS, KM_ALT, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_DESELECT);
-
- kmi = WM_keymap_add_item(keymap, "GPENCIL_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
+ ED_keymap_template_select_all(keymap, "GPENCIL_OT_select_all");
/* circle select */
WM_keymap_add_item(keymap, "GPENCIL_OT_select_circle", CKEY, KM_PRESS, 0, 0);
diff --git a/source/blender/editors/include/ED_keymap_templates.h b/source/blender/editors/include/ED_keymap_templates.h
new file mode 100644
index 00000000000..0a1882d005a
--- /dev/null
+++ b/source/blender/editors/include/ED_keymap_templates.h
@@ -0,0 +1,32 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file ED_keymap_templates.h
+ * \ingroup editors
+ */
+
+#ifndef __ED_KEYMAP_TEMPLATES_H__
+#define __ED_KEYMAP_TEMPLATES_H__
+
+struct wmKeyMap;
+
+void ED_keymap_template_select_all(struct wmKeyMap *keymap, const char *idname);
+
+#endif /* __ED_KEYMAP_TEMPLATES_H__ */
diff --git a/source/blender/editors/lattice/lattice_ops.c b/source/blender/editors/lattice/lattice_ops.c
index 2e6eafb0886..d0c9a385cf2 100644
--- a/source/blender/editors/lattice/lattice_ops.c
+++ b/source/blender/editors/lattice/lattice_ops.c
@@ -37,6 +37,7 @@
#include "ED_screen.h"
#include "ED_select_utils.h"
+#include "ED_keymap_templates.h"
#include "ED_object.h"
#include "ED_lattice.h"
@@ -62,12 +63,8 @@ void ED_keymap_lattice(wmKeyConfig *keyconf)
keymap = WM_keymap_ensure(keyconf, "Lattice", 0, 0);
keymap->poll = ED_operator_editlattice;
- kmi = WM_keymap_add_item(keymap, "LATTICE_OT_select_all", AKEY, KM_PRESS, 0, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_SELECT);
- kmi = WM_keymap_add_item(keymap, "LATTICE_OT_select_all", AKEY, KM_PRESS, KM_ALT, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_DESELECT);
- kmi = WM_keymap_add_item(keymap, "LATTICE_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
- RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
+ ED_keymap_template_select_all(keymap, "LATTICE_OT_select_all");
+
WM_keymap_add_item(keymap, "LATTICE_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "LATTICE_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0);
diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c
index d734f4fbb93..1d815277ed4 100644
--- a/source/blender/editors/mask/mask_edit.c
+++ b/source/blender/editors/mask/mask_edit.c
@@ -43,6 +43,7 @@
#include "ED_screen.h"
#include "ED_select_utils.h"
+#include "ED_keymap_templates.h"
#include "ED
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list