diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-12 06:02:53 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-12 06:02:53 +0400 |
| commit | 94ae0232b0337ab70cecaef03cd845887cd36eaa (patch) | |
| tree | caea2819c7fe0400fb91c9bdf0e99a9e0fd50cf6 /source/blender/editors/space_file | |
| parent | 9a109c22ae1ef8a5c75932d661610b23ec685bd7 (diff) | |
| parent | f68e9db583489d541d535791536ea20bc1ae1d76 (diff) | |
Merged changes in the trunk up to revision 53729.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/file_ops.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 763b18788de..9349abb4d8b 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -28,6 +28,8 @@ * \ingroup spfile */ +#include "BLI_blenlib.h" +#include "BLI_utildefines.h" #include "BKE_context.h" #include "BKE_screen.h" @@ -35,9 +37,6 @@ #include "BKE_report.h" #include "BKE_main.h" -#include "BLI_blenlib.h" -#include "BLI_utildefines.h" - #ifdef WIN32 # include "BLI_winstuff.h" #endif |