blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Cycles: Cleanup, always use braces for blocks

This commit is contained in:
Sergey Sharybin 2017-04-28 13:39:14 +02:00
parent 82e5f60302
commit e3fc945fe2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
intern/cycles/render/image.cpp
View File

@ -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;
}