diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-06 10:13:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-06 10:13:27 +0300 |
| commit | c085d9b1bee0ece984ae45cab85d75fe17a299c3 (patch) | |
| tree | 200694a2c1bcca59c59e3b9df9bd23845e2ecffa /source/blender/makesrna/intern/rna_wm.c | |
| parent | f7b1fec463eaa9dc3a05809b04cebf3a26c86aed (diff) | |
| parent | 907413ca65f46d4d349fb52cfcf42bf6212f62b3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index a4c8dfbbdef..fd0759bfe42 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -382,6 +382,10 @@ const EnumPropertyItem rna_enum_event_type_items[] = { {NDOF_BUTTON_A, "NDOF_BUTTON_A", 0, "NDOF Button A", "NdofBA"}, {NDOF_BUTTON_B, "NDOF_BUTTON_B", 0, "NDOF Button B", "NdofBB"}, {NDOF_BUTTON_C, "NDOF_BUTTON_C", 0, "NDOF Button C", "NdofBC"}, + /* Action Zones. */ + {EVT_ACTIONZONE_AREA, "ACTIONZONE_AREA", 0, "ActionZone Area", "AZone Area"}, + {EVT_ACTIONZONE_REGION, "ACTIONZONE_REGION", 0, "ActionZone Region", "AZone Region"}, + {EVT_ACTIONZONE_FULLSCREEN, "ACTIONZONE_FULLSCREEN", 0, "ActionZone Fullscreen", "AZone FullScr"}, {0, NULL, 0, NULL, NULL} }; |