[Bf-blender-cvs] [3cba77f16b8] blender2.8: Merge branch 'master' into blender2.8
Campbell Barton
noreply at git.blender.org
Sun Sep 2 11:38:32 CEST 2018
Commit: 3cba77f16b80738499142d8c774b0b08dec160e5
Author: Campbell Barton
Date: Sun Sep 2 19:42:29 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB3cba77f16b80738499142d8c774b0b08dec160e5
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/windowmanager/WM_keymap.h
index e184cfe9aa3,0538df83c60..dfa29321bdf
--- a/source/blender/windowmanager/WM_keymap.h
+++ b/source/blender/windowmanager/WM_keymap.h
@@@ -88,6 -78,18 +78,28 @@@ bool WM_keymap_poll(struct bCon
wmKeyMapItem *WM_keymap_item_find_id(struct wmKeyMap *keymap, int id);
bool WM_keymap_item_compare(struct wmKeyMapItem *k1, struct wmKeyMapItem *k2);
+ /* keymap_utils.c */
+
+ /** Wrappers for #WM_keymap_add_item */
+ wmKeyMapItem *WM_keymap_add_menu(
+ struct wmKeyMap *keymap, const char *idname, int type,
+ int val, int modifier, int keymodifier);
+ wmKeyMapItem *WM_keymap_add_menu_pie(
+ struct wmKeyMap *keymap, const char *idname, int type,
+ int val, int modifier, int keymodifier);
++wmKeyMapItem *WM_keymap_add_panel(
++ struct wmKeyMap *keymap, const char *idname, int type,
++ int val, int modifier, int keymodifier);
++wmKeyMapItem *WM_keymap_add_tool(
++ struct wmKeyMap *keymap, const char *idname, int type,
++ int val, int modifier, int keymodifier);
++
++void WM_keymap_add_context_enum_set_items(
++ wmKeyMap *keymap, const struct EnumPropertyItem *items, const char *data_path,
++ int type_start, int val, int modifier, int keymodifier);
+
+ wmKeyMap *WM_keymap_guess_opname(const struct bContext *C, const char *opname);
+
/* Modal Keymap */
int WM_modalkeymap_items_to_string(
diff --cc source/blender/windowmanager/intern/wm_keymap_utils.c
index 00000000000,1774b876f38..ba1874b992c
mode 000000,100644..100644
--- a/source/blender/windowmanager/intern/wm_keymap_utils.c
+++ b/source/blender/windowmanager/intern/wm_keymap_utils.c
@@@ -1,0 -1,328 +1,360 @@@
+ /*
+ * ***** 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 blender/windowmanager/intern/wm_keymap_utils.c
+ * \ingroup wm
+ *
+ * Utilities to help define keymaps.
+ */
+
+ #include <string.h>
+
+ #include "DNA_object_types.h"
+ #include "DNA_space_types.h"
+ #include "DNA_userdef_types.h"
+ #include "DNA_windowmanager_types.h"
+
+ #include "BLI_utildefines.h"
+
+ #include "BKE_context.h"
+
+ #include "RNA_access.h"
+
+ #include "WM_api.h"
+ #include "WM_types.h"
+
+ /* menu wrapper for WM_keymap_add_item */
+
+ /* -------------------------------------------------------------------- */
+ /** \name Wrappers for #WM_keymap_add_item
+ * \{ */
+
++/* menu wrapper for WM_keymap_add_item */
+ wmKeyMapItem *WM_keymap_add_menu(wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier)
+ {
+ wmKeyMapItem *kmi = WM_keymap_add_item(keymap, "WM_OT_call_menu", type, val, modifier, keymodifier);
+ RNA_string_set(kmi->ptr, "name", idname);
+ return kmi;
+ }
+
+ wmKeyMapItem *WM_keymap_add_menu_pie(wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier)
+ {
+ wmKeyMapItem *kmi = WM_keymap_add_item(keymap, "WM_OT_call_menu_pie", type, val, modifier, keymodifier);
+ RNA_string_set(kmi->ptr, "name", idname);
+ return kmi;
+ }
+
++wmKeyMapItem *WM_keymap_add_panel(wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier)
++{
++ wmKeyMapItem *kmi = WM_keymap_add_item(keymap, "WM_OT_call_panel", type, val, modifier, keymodifier);
++ RNA_string_set(kmi->ptr, "name", idname);
++ /* TODO: we might want to disable this. */
++ RNA_boolean_set(kmi->ptr, "keep_open", false);
++ return kmi;
++}
++
++/* tool wrapper for WM_keymap_add_item */
++wmKeyMapItem *WM_keymap_add_tool(wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier)
++{
++ wmKeyMapItem *kmi = WM_keymap_add_item(keymap, "WM_OT_tool_set_by_name", type, val, modifier, keymodifier);
++ RNA_string_set(kmi->ptr, "name", idname);
++ return kmi;
++}
++
++/** Useful for mapping numbers to an enum. */
++void WM_keymap_add_context_enum_set_items(
++ wmKeyMap *keymap, const EnumPropertyItem *items, const char *data_path,
++ int type_start, int val, int modifier, int keymodifier)
++{
++ for (int i = 0, type_offset = 0; items[i].identifier; i++) {
++ if (items[i].identifier[0] == '\0') {
++ continue;
++ }
++ wmKeyMapItem *kmi = WM_keymap_add_item(
++ keymap, "WM_OT_context_set_enum",
++ type_start + type_offset, val, modifier, keymodifier);
++ RNA_string_set(kmi->ptr, "data_path", data_path);
++ RNA_string_set(kmi->ptr, "value", items[i].identifier);
++ type_offset += 1;
++ }
++}
++
+ /** \} */
+
+ /* -------------------------------------------------------------------- */
+ /** \name Introspection
+ * \{ */
+
+ /* Guess an appropriate keymap from the operator name */
+ /* Needs to be kept up to date with Keymap and Operator naming */
+ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname)
+ {
+ /* Op types purposely skipped for now:
+ * BRUSH_OT
+ * BOID_OT
+ * BUTTONS_OT
+ * CONSTRAINT_OT
+ * PAINT_OT
+ * ED_OT
+ * FLUID_OT
+ * TEXTURE_OT
+ * UI_OT
+ * VIEW2D_OT
+ * WORLD_OT
+ */
+
+ wmKeyMap *km = NULL;
+ SpaceLink *sl = CTX_wm_space_data(C);
+
+ /* Window */
+ if (STRPREFIX(opname, "WM_OT")) {
+ km = WM_keymap_find_all(C, "Window", 0, 0);
+ }
+ /* Screen & Render */
+ else if (STRPREFIX(opname, "SCREEN_OT") ||
+ STRPREFIX(opname, "RENDER_OT") ||
+ STRPREFIX(opname, "SOUND_OT") ||
+ STRPREFIX(opname, "SCENE_OT"))
+ {
+ km = WM_keymap_find_all(C, "Screen", 0, 0);
+ }
+ /* Grease Pencil */
+ else if (STRPREFIX(opname, "GPENCIL_OT")) {
+ km = WM_keymap_find_all(C, "Grease Pencil", 0, 0);
+ }
+ /* Markers */
+ else if (STRPREFIX(opname, "MARKER_OT")) {
+ km = WM_keymap_find_all(C, "Markers", 0, 0);
+ }
+ /* Import/Export*/
+ else if (STRPREFIX(opname, "IMPORT_") ||
+ STRPREFIX(opname, "EXPORT_"))
+ {
+ km = WM_keymap_find_all(C, "Window", 0, 0);
+ }
+
+
+ /* 3D View */
+ else if (STRPREFIX(opname, "VIEW3D_OT")) {
+ km = WM_keymap_find_all(C, "3D View", sl->spacetype, 0);
+ }
+ else if (STRPREFIX(opname, "OBJECT_OT")) {
+ /* exception, this needs to work outside object mode too */
+ if (STRPREFIX(opname, "OBJECT_OT_mode_set"))
+ km = WM_keymap_find_all(C, "Object Non-modal", 0, 0);
+ else
+ km = WM_keymap_find_all(C, "Object Mode", 0, 0);
+ }
+ /* Object mode related */
+ else if (STRPREFIX(opname, "GROUP_OT") ||
+ STRPREFIX(opname, "MATERIAL_OT") ||
+ STRPREFIX(opname, "PTCACHE_OT") ||
+ STRPREFIX(opname, "RIGIDBODY_OT"))
+ {
+ km = WM_keymap_find_all(C, "Object Mode", 0, 0);
+ }
+
+ /* Editing Modes */
+ else if (STRPREFIX(opname, "MESH_OT")) {
+ km = WM_keymap_find_all(C, "Mesh", 0, 0);
+
+ /* some mesh operators are active in object mode too, like add-prim */
+ if (km && !WM_keymap_poll((bContext *)C, km)) {
+ km = WM_keymap_find_all(C, "Object Mode", 0, 0);
+ }
+ }
+ else if (STRPREFIX(opname, "CURVE_OT") ||
+ STRPREFIX(opname, "SURFACE_OT"))
+ {
+ km = WM_keymap_find_all(C, "Curve", 0, 0);
+
+ /* some curve operators are active in object mode too, like add-prim */
+ if (km && !WM_keymap_poll((bContext *)C, km)) {
+ km = WM_keymap_find_all(C, "Object Mode", 0, 0);
+ }
+ }
+ else if (STRPREFIX(opname, "ARMATURE_OT") ||
+ STRPREFIX(opname, "SKETCH_OT"))
+ {
+ km = WM_keymap_find_all(C, "Armature", 0, 0);
+ }
+ else if (STRPREFIX(opname, "POSE_OT") ||
+ STRPREFIX(opname, "POSELIB_OT"))
+ {
+ km = WM_keymap_find_all(C, "Pose", 0, 0);
+ }
+ else if (STRPREFIX(opname, "SCULPT_OT")) {
+ switch (CTX_data_mode_enum(C)) {
+ case OB_MODE_SCULPT:
+ km = WM_keymap_find_all(C, "Sculpt", 0, 0);
+ break;
+ case OB_MODE_EDIT:
+ km = WM_keymap_find_all(C, "UV Sculpt", 0, 0);
+ break;
+ }
+ }
+ else if (STRPREFIX(opname, "MBALL_OT")) {
+ km = WM_keymap_find_all(C, "Metaball", 0, 0);
+
+ /* some mball operators are active in object mode too, like add-prim */
+ if (km && !WM_keymap_poll((bContext *)C, km)) {
+ km = WM_keymap_find_all(C, "Object Mode", 0, 0);
+ }
+ }
+ else if (STRPREFIX(opname, "LATTICE_OT")) {
+ km = WM_keymap_find_all(C, "Lattice", 0, 0);
+ }
+ else if (STRPREFIX(opname, "PARTICLE_OT")) {
+ km = WM_keymap_find_all(C, "Particle", 0, 0);
+ }
+ else if (STRPREFIX(opname, "FONT_OT")) {
+ km = WM_keymap_find_all(C, "Font", 0, 0);
+ }
+ /* Paint Face Mask */
+ else if (STRPREFIX(opname, "PAINT_OT_face_select")) {
+ km = WM_keymap_find_all(C, "Face Mask", 0, 0);
+ }
+ else if (STRPREFIX(opname, "PAINT_OT")) {
+ /* check for relevant mode */
+ switch (CTX_data_mode_enum(C)) {
+ case OB_MODE_WEIGHT_PAINT:
+ km = WM_keymap_find_all(C, "Weight Paint", 0, 0);
+ break;
+ case OB_MODE_VERTEX_PAINT:
+ km = WM_keymap_find_all(C, "Vertex Paint", 0, 0);
+ break;
+ case OB_MODE_TEXTURE_PAINT:
+ km = WM_keymap_find_all(C, "Image Paint", 0, 0);
+ break;
+ }
+ }
- /* Timeline */
- else if (STRPREFIX(opname, "TIME_OT")) {
- km = WM_keymap_find_all(C, "Timeline", sl->spacetype, 0);
- }
+ /* Image Editor */
+ else if (STRPREFIX(opname, "IMAGE_OT")) {
+ km = WM_keymap_find_all(C, "Image", sl->spacetype, 0);
+ }
+ /* Clip Editor */
+ else if (STRPREFIX(opname, "CLIP_OT")) {
+ km = WM_keymap_find_all(C, "Clip", sl->spacetype, 0);
+ }
+ else if (STRPREFIX(opname, "MASK_OT")) {
+ k
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list