diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-28 14:39:14 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-28 14:39:14 +0300 |
commit | e3fc945fe2ba1883bd706c1fd04acce83c3529c3 (patch) | |
tree | 57ddddc07c3d07a26d910204b0562567066d57fc | |
parent | 82e5f603027ee8e1d2a05d1cbfd47425556cbfe2 (diff) |
Cycles: Cleanup, always use braces for blocks
-rw-r--r-- | intern/cycles/render/image.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index cd5db841bda..f79a057f1d4 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -1017,20 +1017,22 @@ void ImageManager::device_update_slot(Device *device, uint8_t ImageManager::pack_image_options(ImageDataType type, size_t slot) { uint8_t options = 0; - /* Image Options are packed into one uint: * bit 0 -> Interpolation - * bit 1 + 2 + 3-> Extension */ - if(images[type][slot]->interpolation == INTERPOLATION_CLOSEST) + * bit 1 + 2 + 3 -> Extension + */ + if(images[type][slot]->interpolation == INTERPOLATION_CLOSEST) { options |= (1 << 0); - - if(images[type][slot]->extension == EXTENSION_REPEAT) + } + if(images[type][slot]->extension == EXTENSION_REPEAT) { options |= (1 << 1); - else if(images[type][slot]->extension == EXTENSION_EXTEND) + } + else if(images[type][slot]->extension == EXTENSION_EXTEND) { options |= (1 << 2); - else /* EXTENSION_CLIP */ + } + else /* EXTENSION_CLIP */ { options |= (1 << 3); - + } return options; } |