Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix possibly uninitialized variable

Browse Source 
Hopefully this was a reason of randomly disappearing textures in our renders.
This commit is contained in:
Sergey Sharybin
2017-03-03 10:09:42 +01:00
parent df88d54284
commit 810d7d4694
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,9 +285,8 @@ int ImageManager::add_image(const string& filename,
thread_scoped_lock device_lock(device_mutex); thread_scoped_lock device_lock(device_mutex);
/* Do we have a float? */ /* Check whether it's a float texture. */
if(type == IMAGE_DATA_TYPE_FLOAT || type == IMAGE_DATA_TYPE_FLOAT4) is_float = (type == IMAGE_DATA_TYPE_FLOAT || type == IMAGE_DATA_TYPE_FLOAT4);
is_float = true;
/* No single channel and half textures on CUDA (Fermi) and no half on OpenCL, use available slots */ /* No single channel and half textures on CUDA (Fermi) and no half on OpenCL, use available slots */
if((type == IMAGE_DATA_TYPE_FLOAT || if((type == IMAGE_DATA_TYPE_FLOAT ||