[Bf-blender-cvs] [b596d70a1f1] xr-actions-D9124: Apply formatting
Peter Kim
noreply at git.blender.org
Mon Oct 26 18:17:53 CET 2020
Commit: b596d70a1f1d69f0412656eca2ddcc342f3c245b
Author: Peter Kim
Date: Tue Oct 27 02:05:24 2020 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rBb596d70a1f1d69f0412656eca2ddcc342f3c245b
Apply formatting
===================================================================
M source/blender/makesrna/intern/rna_wm.c
M source/blender/windowmanager/WM_keymap.h
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_keymap.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 598e1751bb1..66f0278a30b 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -3022,9 +3022,9 @@ static void rna_def_keyconfig(BlenderRNA *brna)
RNA_def_property_string_sdna(prop, NULL, "xr_action_set");
RNA_def_property_ui_text(prop, "XR Action Set", "XR action set name");
RNA_def_property_string_funcs(prop,
- "rna_wmKeyMapItem_xr_action_set_get",
- "rna_wmKeyMapItem_xr_action_set_length",
- "rna_wmKeyMapItem_xr_action_set_set");
+ "rna_wmKeyMapItem_xr_action_set_get",
+ "rna_wmKeyMapItem_xr_action_set_length",
+ "rna_wmKeyMapItem_xr_action_set_set");
RNA_def_struct_name_property(srna, prop);
RNA_def_property_update(prop, 0, "rna_KeyMapItem_update");
@@ -3032,9 +3032,9 @@ static void rna_def_keyconfig(BlenderRNA *brna)
RNA_def_property_string_sdna(prop, NULL, "xr_action");
RNA_def_property_ui_text(prop, "XR Action", "XR action name");
RNA_def_property_string_funcs(prop,
- "rna_wmKeyMapItem_xr_action_get",
- "rna_wmKeyMapItem_xr_action_length",
- "rna_wmKeyMapItem_xr_action_set");
+ "rna_wmKeyMapItem_xr_action_get",
+ "rna_wmKeyMapItem_xr_action_length",
+ "rna_wmKeyMapItem_xr_action_set");
RNA_def_struct_name_property(srna, prop);
RNA_def_property_update(prop, 0, "rna_KeyMapItem_update");
diff --git a/source/blender/windowmanager/WM_keymap.h b/source/blender/windowmanager/WM_keymap.h
index e9f3381cc45..2373cd6c4c6 100644
--- a/source/blender/windowmanager/WM_keymap.h
+++ b/source/blender/windowmanager/WM_keymap.h
@@ -86,7 +86,9 @@ bool WM_keymap_remove(struct wmKeyConfig *keyconfig, struct wmKeyMap *keymap);
bool WM_keymap_poll(struct bContext *C, struct wmKeyMap *keymap);
wmKeyMapItem *WM_keymap_item_find_id(struct wmKeyMap *keymap, int id);
-wmKeyMapItem *WM_keymap_item_find_xr(struct wmKeyMap *keymap, const char *action_set, const char *action);
+wmKeyMapItem *WM_keymap_item_find_xr(struct wmKeyMap *keymap,
+ const char *action_set,
+ const char *action);
bool WM_keymap_item_compare(struct wmKeyMapItem *k1, struct wmKeyMapItem *k2);
/* keymap_utils.c */
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 343fce49270..cbc26053497 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -3229,16 +3229,24 @@ static void wm_event_do_surface_handlers(bContext *C, wmSurface *surface)
LISTBASE_FOREACH (wmEvent *, event, events) {
wmXrActionData *action_data = event->customdata;
- PointerRNA properties = { .type = action_data->ot->srna, .data = action_data->op_properties };
+ PointerRNA properties = {.type = action_data->ot->srna,
+ .data = action_data->op_properties};
if (action_data->ot->invoke) {
/* Invoke operator, either executing operator or transferring responsibility to window
* modal handlers. */
- wm_operator_invoke(C, action_data->ot, event, action_data->op_properties ? &properties : NULL, NULL, false, false);
+ wm_operator_invoke(C,
+ action_data->ot,
+ event,
+ action_data->op_properties ? &properties : NULL,
+ NULL,
+ false,
+ false);
}
else {
/* Execute operator. */
- wmOperator *op = wm_operator_create(wm, action_data->ot, action_data->op_properties ? &properties : NULL, NULL);
+ wmOperator *op = wm_operator_create(
+ wm, action_data->ot, action_data->op_properties ? &properties : NULL, NULL);
if ((WM_operator_call(C, op) & OPERATOR_HANDLED) == 0) {
WM_operator_free(op);
}
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index cf0096bceb2..92dd1813787 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -2058,7 +2058,8 @@ wmKeyMapItem *WM_keymap_item_find_xr(wmKeyMap *keymap, const char *action_set, c
wmKeyMapItem *kmi;
for (kmi = keymap->items.first; kmi; kmi = kmi->next) {
- if ((kmi->type == EVT_XR_ACTION) && STREQ(kmi->xr_action_set, action_set) && STREQ(kmi->xr_action, action)) {
+ if ((kmi->type == EVT_XR_ACTION) && STREQ(kmi->xr_action_set, action_set) &&
+ STREQ(kmi->xr_action, action)) {
return kmi;
}
}
More information about the Bf-blender-cvs
mailing list