diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-18 14:33:05 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-18 14:33:05 +0300 |
commit | 2bc952fdb6e1474e9e568224a37bcf5cff874aaf (patch) | |
tree | 8d7c3a99896415392035ba350a606d350b6d5e37 /source/blender/windowmanager | |
parent | 5d3f679013bbbb9f0c7aae47b5653c54266cf7ca (diff) | |
parent | 7ff3cd26932cbc93068eea4dc7438442216e4ee1 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 28775050211..6da9101156a 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -41,7 +41,7 @@ #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_lasso.h" +#include "BLI_lasso_2d.h" #include "BKE_context.h" diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 47df14cd647..53718841bc0 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -59,7 +59,7 @@ #include "PIL_time.h" #include "BLI_blenlib.h" -#include "BLI_dial.h" +#include "BLI_dial_2d.h" #include "BLI_dynstr.h" /*for WM_operator_pystring */ #include "BLI_math.h" #include "BLI_utildefines.h" |