diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-11-12 16:30:02 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-11-12 16:30:02 +0400 |
| commit | 6b65102c20e9bdafd90f55f60c2a2084d873e809 (patch) | |
| tree | a0f5554702501d2da1073b22ff55f740aff135f9 /source/blender/render/intern/source/texture_ocean.c | |
| parent | 053710fcbc78ff83b9617be87558876e381f85a6 (diff) | |
| parent | 83de5cb30831328548502126dff84ffdb72544f2 (diff) | |
Merge w/ trunk: r51141-52085 (Important Note: gameengine and blenderplayer were not merged due to complex differences)
Diffstat (limited to 'source/blender/render/intern/source/texture_ocean.c')
| -rw-r--r-- | source/blender/render/intern/source/texture_ocean.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/texture_ocean.c b/source/blender/render/intern/source/texture_ocean.c index b2bc635cba7..a7547479093 100644 --- a/source/blender/render/intern/source/texture_ocean.c +++ b/source/blender/render/intern/source/texture_ocean.c @@ -55,7 +55,7 @@ extern struct Render R; /* ***** actual texture sampling ***** */ -int ocean_texture(Tex *tex, float *texvec, TexResult *texres) +int ocean_texture(Tex *tex, const float texvec[2], TexResult *texres) { OceanTex *ot = tex->ot; ModifierData *md; |