[Bf-blender-cvs] [e3fc945fe2b] master: Cycles: Cleanup, always use braces for blocks

Sergey Sharybin noreply at git.blender.org
Fri Apr 28 13:45:55 CEST 2017


Commit: e3fc945fe2ba1883bd706c1fd04acce83c3529c3
Author: Sergey Sharybin
Date:   Fri Apr 28 13:39:14 2017 +0200
Branches: master
https://developer.blender.org/rBe3fc945fe2ba1883bd706c1fd04acce83c3529c3

Cycles: Cleanup, always use braces for blocks

===================================================================

M	intern/cycles/render/image.cpp

===================================================================

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




More information about the Bf-blender-cvs mailing list