Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Pogribnyi <pogribnyi@gmail.com>2015-03-15 21:57:06 +0300
committerRoman Pogribnyi <pogribnyi@gmail.com>2015-03-15 21:57:06 +0300
commit5c64aa25541b973db4ec90c97e30b02d09b00075 (patch)
tree0cd3a8912d8b0cbfc5fe0bb94a2a42751e98dcd6 /source/blender/modifiers/intern/MOD_ocean.c
parent2a1a6bc5720a4310e42a67754998e0480bf7c59b (diff)
parent225027ce5dea3785626908b58b01fb3959cf8362 (diff)
Merge branch 'master' into soc-2014-fluid
Diffstat (limited to 'source/blender/modifiers/intern/MOD_ocean.c')
-rw-r--r--source/blender/modifiers/intern/MOD_ocean.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index a324702a6ae..1c8dcdff46d 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -43,8 +43,6 @@
#include "BKE_modifier.h"
#include "BKE_ocean.h"
-#include "MOD_util.h"
-
#ifdef WITH_OCEANSIM
static void init_cache_data(Object *ob, struct OceanModifierData *omd)
{