diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-17 17:44:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-17 17:44:15 +0400 |
| commit | 979f6bab9c1aba27b8d018d1481987d841f68ee1 (patch) | |
| tree | 162419d475bf68326b3b5e88b25f27057fee6831 /source/blender/compositor/operations/COM_TextureOperation.cpp | |
| parent | fe0d1a381003408dedcd3142a727c77806617150 (diff) | |
style cleanup: braces, compositor
Diffstat (limited to 'source/blender/compositor/operations/COM_TextureOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_TextureOperation.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_TextureOperation.cpp b/source/blender/compositor/operations/COM_TextureOperation.cpp index 1ca986f8893..3eb08140914 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.cpp +++ b/source/blender/compositor/operations/COM_TextureOperation.cpp @@ -52,7 +52,8 @@ void TextureBaseOperation::determineResolution(unsigned int resolution[], unsign if (preferredResolution[0] == 0 || preferredResolution[1] == 0) { resolution[0] = COM_DEFAULT_RESOLUTION_WIDTH; resolution[1] = COM_DEFAULT_RESOLUTION_HEIGHT; - } else { + } + else { resolution[0] = preferredResolution[0]; resolution[1] = preferredResolution[1]; } @@ -86,12 +87,12 @@ void TextureBaseOperation::executePixel(float *color, float x, float y, PixelSam retval= multitex_ext(this->texture, vec, NULL, NULL, 0, &texres); - if(texres.talpha) + if (texres.talpha) color[3]= texres.ta; else color[3]= texres.tin; - if((retval & TEX_RGB)) { + if ((retval & TEX_RGB)) { color[0]= texres.tr; color[1]= texres.tg; color[2]= texres.tb; |