diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-02 16:18:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-02 16:18:10 +0300 |
| commit | 89fdd8890633700f559039998f8d95c7a5f97df4 (patch) | |
| tree | a77306882df479d5d2d89f0f9d3529394b4fbe01 /source/blender/windowmanager | |
| parent | 57bbd478a58a944a8f3146af25cfe34ee055fc86 (diff) | |
| parent | 4ffa05c30b10eb8a07dd0a9b43466f6d11bc1364 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager')
4 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 4a4a993b386..33bbb624192 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -69,6 +69,7 @@ #include "ED_screen.h" #include "ED_view3d.h" #include "ED_util.h" +#include "ED_undo.h" #include "RNA_access.h" diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index bb9ff0ab8eb..897a6308dd3 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -106,6 +106,7 @@ #include "ED_screen.h" #include "ED_view3d.h" #include "ED_util.h" +#include "ED_undo.h" #include "GHOST_C-api.h" #include "GHOST_Path-api.h" diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 534b20ff22e..4c7c2cc96e4 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -114,6 +114,7 @@ #include "ED_space_api.h" #include "ED_screen.h" #include "ED_util.h" +#include "ED_undo.h" #include "UI_interface.h" #include "BLF_api.h" diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index ebe68bc8f35..e19ec6ca265 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -99,7 +99,7 @@ #include "ED_numinput.h" #include "ED_screen.h" -#include "ED_util.h" +#include "ED_undo.h" #include "ED_view3d.h" #include "RNA_access.h" |