[Bf-blender-cvs] [2c9add9] master: Fix use of uninitialized variable in Cycles OpenCL image textures.

Brecht Van Lommel noreply at git.blender.org
Sat Jul 2 21:54:59 CEST 2016


Commit: 2c9add965b27b4fbb3a2ed99bd248c7b2b41ddcc
Author: Brecht Van Lommel
Date:   Sat Jul 2 14:11:11 2016 +0200
Branches: master
https://developer.blender.org/rB2c9add965b27b4fbb3a2ed99bd248c7b2b41ddcc

Fix use of uninitialized variable in Cycles OpenCL image textures.

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

M	intern/cycles/render/image.cpp

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

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index d497661..614620c 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -1078,7 +1078,8 @@ void ImageManager::device_update_slot(Device *device,
 
 uint8_t ImageManager::pack_image_options(ImageDataType type, size_t slot)
 {
-	uint8_t options;
+	uint8_t options = 0;
+
 	/* Image Options are packed into one uint:
 	 * bit 0 -> Interpolation
 	 * bit 1 + 2  + 3-> Extension */




More information about the Bf-blender-cvs mailing list