diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-25 01:57:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-25 01:57:13 +0400 |
| commit | c411cde415ee7dc8a208e932d5ba1a240c4e669e (patch) | |
| tree | 73cd438267668b806d88f152cee8506833b4ae85 /source/blender/blenkernel/intern/ocean.c | |
| parent | 7539009d5b3ee1b2ddb76400917a9876a3cfe184 (diff) | |
header cleanup, include BLI before BKE, also use bool for ntreeShaderExecTree
Diffstat (limited to 'source/blender/blenkernel/intern/ocean.c')
| -rw-r--r-- | source/blender/blenkernel/intern/ocean.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index c4274aa1f93..695ac7da792 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -35,10 +35,6 @@ #include "DNA_scene_types.h" -#include "BKE_global.h" /* XXX TESTING */ -#include "BKE_image.h" -#include "BKE_ocean.h" - #include "BLI_math.h" #include "BLI_path_util.h" #include "BLI_rand.h" @@ -46,6 +42,9 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" +#include "BKE_image.h" +#include "BKE_ocean.h" + #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -1425,4 +1424,4 @@ void BKE_bake_ocean(struct Ocean *UNUSED(o), struct OceanCache *UNUSED(och), /* unused */ (void)update_cb; } -#endif /* WITH_OCEANSIM */
\ No newline at end of file +#endif /* WITH_OCEANSIM */ |