diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-01-16 22:50:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-01-16 23:03:12 +0300 |
| commit | 43872f59b9a6c471b81fff48b09a2f5e2487d985 (patch) | |
| tree | c4ae234968ee6aa108c03a057d8bc83a310e99f9 /source/blender/windowmanager | |
| parent | af9e99763c95add81f72cf619acf9098e6cd9f1a (diff) | |
| parent | e0303d02974c914d4633e37d789e33b21689b5eb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/manipulators/intern/wm_manipulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c index 824141d1c40..7fdbb0d6324 100644 --- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c +++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c @@ -31,8 +31,8 @@ #include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_path_util.h" #include "BLI_string.h" +#include "BLI_string_utils.h" #include "ED_screen.h" #include "ED_view3d.h" |