diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-22 23:47:37 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-22 23:47:37 +0300 |
| commit | 84a9d171dab04f61a10a335a709838c0452924b8 (patch) | |
| tree | 88696aa7027abc04feb96b60e2fd653b16a32fa9 /intern | |
| parent | 27e4ce0cf6540625bea78b23e98dfadbe19b8e63 (diff) | |
Cleanup: Use short condition style.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/image.cpp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 9f40e561f59..150c742fd24 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -141,19 +141,11 @@ ImageManager::ImageDataType ImageManager::get_image_metadata(const string& filen if(is_float) { is_linear = true; - - if(channels > 1) - return IMAGE_DATA_TYPE_FLOAT4; - else - return IMAGE_DATA_TYPE_FLOAT; + return (channels > 1) ? IMAGE_DATA_TYPE_FLOAT4 : IMAGE_DATA_TYPE_FLOAT; } else { - if(channels > 1) - return IMAGE_DATA_TYPE_BYTE4; - else - return IMAGE_DATA_TYPE_BYTE; + return (channels > 1) ? IMAGE_DATA_TYPE_BYTE4 : IMAGE_DATA_TYPE_BYTE; } - } ImageInput *in = ImageInput::create(filename); @@ -202,16 +194,10 @@ ImageManager::ImageDataType ImageManager::get_image_metadata(const string& filen } if(is_float) { - if(channels > 1) - return IMAGE_DATA_TYPE_FLOAT4; - else - return IMAGE_DATA_TYPE_FLOAT; + return (channels > 1) ? IMAGE_DATA_TYPE_FLOAT4 : IMAGE_DATA_TYPE_FLOAT; } else { - if(channels > 1) - return IMAGE_DATA_TYPE_BYTE4; - else - return IMAGE_DATA_TYPE_BYTE; + return (channels > 1) ? IMAGE_DATA_TYPE_BYTE4 : IMAGE_DATA_TYPE_BYTE; } } |