Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-01-13 11:48:54 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-01-13 11:56:49 +0300
commit7af8271c34ac07a0ea50aafbde7cc72262a8c451 (patch)
tree24a037caf0fddd674489e1bb0e2f385a39d8f103 /source/blender/windowmanager
parentba44919601c540218ce05765915689d3837b8420 (diff)
Fix WM_event_print error printing tweak events value
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_event_query.c24
1 files changed, 19 insertions, 5 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_query.c b/source/blender/windowmanager/intern/wm_event_query.c
index a996796104b..9d23617d5b4 100644
--- a/source/blender/windowmanager/intern/wm_event_query.c
+++ b/source/blender/windowmanager/intern/wm_event_query.c
@@ -54,6 +54,23 @@
/** \name Event Printing
* \{ */
+static void event_ids_from_type_and_value(const short type,
+ const short val,
+ const char **r_type_id,
+ const char **r_val_id)
+{
+ /* Type. */
+ RNA_enum_identifier(rna_enum_event_type_items, type, r_type_id);
+
+ /* Value. */
+ if (ISTWEAK(type)) {
+ RNA_enum_identifier(rna_enum_event_value_tweak_items, val, r_val_id);
+ }
+ else {
+ RNA_enum_identifier(rna_enum_event_value_items, val, r_val_id);
+ }
+}
+
/* for debugging only, getting inspecting events manually is tedious */
void WM_event_print(const wmEvent *event)
{
@@ -64,11 +81,8 @@ void WM_event_print(const wmEvent *event)
const char *prev_type_id = unknown;
const char *prev_val_id = unknown;
- RNA_enum_identifier(rna_enum_event_type_items, event->type, &type_id);
- RNA_enum_identifier(rna_enum_event_value_items, event->val, &val_id);
-
- RNA_enum_identifier(rna_enum_event_type_items, event->prevtype, &prev_type_id);
- RNA_enum_identifier(rna_enum_event_value_items, event->prevval, &prev_val_id);
+ event_ids_from_type_and_value(event->type, event->val, &type_id, &val_id);
+ event_ids_from_type_and_value(event->prevtype, event->prevval, &prev_type_id, &prev_val_id);
printf(
"wmEvent type:%d / %s, val:%d / %s,\n"