diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/ocean.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 229b5193e9c..57f22a8d709 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -40,7 +40,7 @@ extern "C" { /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 5 +#define BLENDER_FILE_SUBVERSION 6 /* Minimum Blender version that supports reading file written with the current * version. Older Blender versions will test this and show a warning if the file diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index 8957628c76a..609c5c1e580 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -831,7 +831,7 @@ void BKE_ocean_init(struct Ocean *o, o->_A = A; o->_w = w; o->_damp_reflections = 1.0f - damp; - o->_wind_alignment = alignment; + o->_wind_alignment = alignment * 10.0f; o->_depth = depth; o->_Lx = Lx; o->_Lz = Lz; @@ -845,7 +845,7 @@ void BKE_ocean_init(struct Ocean *o, /* Common JONSWAP parameters. */ o->_fetch_jonswap = fetch_jonswap; - o->_sharpen_peak_jonswap = sharpen_peak_jonswap; + o->_sharpen_peak_jonswap = sharpen_peak_jonswap * 10.0f; o->_do_disp_y = do_height_field; o->_do_normals = do_normals; |