diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-29 21:57:42 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-29 22:05:22 +0300 |
| commit | f874aeef70f2f315c3062d9694ae816674d0cdd0 (patch) | |
| tree | e2c8ddb8ecfc415d89225a081ae8755f355993bd /source/blender/editors/screen/screen_ops.c | |
| parent | 6ecab6dd8e48d564a2b43e0e81e79d079e8b4c77 (diff) | |
| parent | bf7d7bc323d5505b78688af2df1f66e1053f62e1 (diff) | |
Merge branch 'master' into blender2.8
Please **DO NOT** add changes from master when it's totally uneeded!
Changes to BLI_ area most certainly shall *always* be done in master,
there is absolutely no point in adding more diff between the two
branches than needed, will only makes merging more cumbersome!
Conflicts:
CMakeLists.txt
source/blender/blenlib/intern/math_vector_inline.c
Diffstat (limited to 'source/blender/editors/screen/screen_ops.c')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 681b5954512..32b63aca34c 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -4334,6 +4334,7 @@ void ED_operatortypes_screen(void) WM_operatortype_append(ED_OT_undo); WM_operatortype_append(ED_OT_undo_push); WM_operatortype_append(ED_OT_redo); + WM_operatortype_append(ED_OT_undo_redo); WM_operatortype_append(ED_OT_undo_history); WM_operatortype_append(ED_OT_flush_edits); |