diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 04:35:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 04:35:26 +0400 |
commit | 743d2f8c0f4359eef120eab4db7bfe00b5185e05 (patch) | |
tree | 2ea0e95f16a5a4cdb285ef40202995842ad6f920 /source/blender/blenkernel/intern/ocean.c | |
parent | 7d124edeadeb60b41e7c828c6b9c18c0850aa933 (diff) |
rename image type defines to be less ambiguous, also set BMP as not supporting alpha (it reads but cant write)
Diffstat (limited to 'source/blender/blenkernel/intern/ocean.c')
-rw-r--r-- | source/blender/blenkernel/intern/ocean.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index dbcdf5555ab..b8f96fa732d 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -1018,7 +1018,7 @@ static void cache_filename(char *string, const char *path, const char *relbase, BLI_join_dirfile(cachepath, sizeof(cachepath), path, fname); - BKE_makepicstring(string, cachepath, relbase, frame, R_OPENEXR, 1, TRUE); + BKE_makepicstring(string, cachepath, relbase, frame, R_IMF_IMTYPE_OPENEXR, 1, TRUE); } void BKE_free_ocean_cache(struct OceanCache *och) @@ -1204,9 +1204,9 @@ void BKE_bake_ocean(struct Ocean *o, struct OceanCache *och, void (*update_cb)(v BLI_srand(0); /* setup image format */ - imf.imtype= R_OPENEXR; + imf.imtype= R_IMF_IMTYPE_OPENEXR; imf.depth= R_IMF_CHAN_DEPTH_16; - imf.exr_codec= 2; /* ZIP */ + imf.exr_codec= R_IMF_EXR_CODEC_ZIP; /* ZIP */ |