diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-06 17:24:34 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-06 17:24:34 +0400 |
| commit | acfc0ea5111bcab5ea5795187d08b2f6ec5addaa (patch) | |
| tree | d9fb7e477ac551859ca95c1f0482eca8b3af1077 /source/blender/blenloader | |
| parent | 72d0cc1f6123900f5593cd0fe428568f5aa7f682 (diff) | |
| parent | 2ed2226ee753cc6a7a19806d99772efa61af897f (diff) | |
svn merge ^/trunk/blender -r55815:55840
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/runtime.c | 6 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/undofile.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/blenloader/intern/runtime.c b/source/blender/blenloader/intern/runtime.c index cbbaf713e84..d6fd2f92443 100644 --- a/source/blender/blenloader/intern/runtime.c +++ b/source/blender/blenloader/intern/runtime.c @@ -45,12 +45,12 @@ # include <unistd.h> // read #endif -#include "BLO_readfile.h" -#include "BLO_runtime.h" - #include "BLI_blenlib.h" #include "BLI_utildefines.h" +#include "BLO_readfile.h" +#include "BLO_runtime.h" + #include "BKE_blender.h" #include "BKE_report.h" diff --git a/source/blender/blenloader/intern/undofile.c b/source/blender/blenloader/intern/undofile.c index 38fd6e9d32d..2b63d13a9dd 100644 --- a/source/blender/blenloader/intern/undofile.c +++ b/source/blender/blenloader/intern/undofile.c @@ -30,7 +30,6 @@ * \ingroup blenloader */ - #include <stdlib.h> #include <string.h> #include <stdio.h> @@ -40,13 +39,10 @@ #include "DNA_listBase.h" - -#include "BLO_undofile.h" - #include "BLI_blenlib.h" #include "BLI_linklist.h" - +#include "BLO_undofile.h" /* **************** support for memory-write, for undo buffers *************** */ |