diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-15 22:45:20 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-15 22:45:20 +0400 |
| commit | e79c29a1d6985a4b1978a547f80ba6fc6be6b475 (patch) | |
| tree | 90ebc3e2b1bc48be47bbbb0cbd99523e2baa319e /source/blender/render/intern/source/texture_ocean.c | |
| parent | 7aa21d677aea676fcedf76f330775f4c38e71f3f (diff) | |
style cleanup: raytree code
Diffstat (limited to 'source/blender/render/intern/source/texture_ocean.c')
| -rw-r--r-- | source/blender/render/intern/source/texture_ocean.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/render/intern/source/texture_ocean.c b/source/blender/render/intern/source/texture_ocean.c index c13347dc162..4ef88e4740a 100644 --- a/source/blender/render/intern/source/texture_ocean.c +++ b/source/blender/render/intern/source/texture_ocean.c @@ -56,7 +56,7 @@ extern struct Render R; /* ***** actual texture sampling ***** */ int ocean_texture(Tex *tex, float *texvec, TexResult *texres) { - OceanTex *ot= tex->ot; + OceanTex *ot = tex->ot; ModifierData *md; OceanModifierData *omd; @@ -64,8 +64,8 @@ int ocean_texture(Tex *tex, float *texvec, TexResult *texres) if ( !(ot) || !(ot->object) || - !(md = (ModifierData *)modifiers_findByType(ot->object, eModifierType_Ocean)) || - !(omd= (OceanModifierData *)md)->ocean) + !(md = (ModifierData *)modifiers_findByType(ot->object, eModifierType_Ocean)) || + !(omd = (OceanModifierData *)md)->ocean) { return 0; } @@ -75,10 +75,10 @@ int ocean_texture(Tex *tex, float *texvec, TexResult *texres) int retval = TEX_INT; OceanResult ocr; - const float u = 0.5f+0.5f*texvec[0]; - const float v = 0.5f+0.5f*texvec[1]; + const float u = 0.5f + 0.5f * texvec[0]; + const float v = 0.5f + 0.5f * texvec[1]; - if (omd->oceancache && omd->cached==TRUE) { + if (omd->oceancache && omd->cached == TRUE) { CLAMP(cfra, omd->bakestart, omd->bakeend); cfra -= omd->bakestart; // shift to 0 based |