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:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-05-29 20:03:09 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-05-29 20:03:09 +0400
commitbcf32407c115753ba1236a37a6a8fed592446d8f (patch)
tree1abf3593496ed0d58eb78b3a802815e2017af017 /source/blender/makesrna
parent2757153d02a8264013aecc0e56c19d504a966c72 (diff)
Fix #35374: Region overlap + bugs
Was missing keymap for REGION_TIMER, which ended up in missing updates happening. Added this kind of timer to RNA, so keymaps could bind to it. Also made 3ds max keymap working again. Too bad it was broken in 2.67 and 2.67a :S
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_wm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index c6a8e26eeac..aae1581def6 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -121,6 +121,7 @@ EnumPropertyItem event_timer_type_items[] = {
{TIMERJOBS, "TIMER_JOBS", 0, "Timer Jobs", ""},
{TIMERAUTOSAVE, "TIMER_AUTOSAVE", 0, "Timer Autosave", ""},
{TIMERREPORT, "TIMER_REPORT", 0, "Timer Report", ""},
+ {TIMERREGION, "TIMERREGION", 0, "Timer Region", ""},
{0, NULL, 0, NULL, NULL}
};
@@ -334,6 +335,7 @@ EnumPropertyItem event_type_items[] = {
{TIMERJOBS, "TIMER_JOBS", 0, "Timer Jobs", ""},
{TIMERAUTOSAVE, "TIMER_AUTOSAVE", 0, "Timer Autosave", ""},
{TIMERREPORT, "TIMER_REPORT", 0, "Timer Report", ""},
+ {TIMERREGION, "TIMER_REGION", 0, "Timer Region", ""},
{0, "", 0, NULL, NULL},
{NDOF_MOTION, "NDOF_MOTION", 0, "NDOF Motion", ""},
/* buttons on all 3dconnexion devices */