diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-03 12:09:42 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-03 12:10:26 +0300 |
| commit | 810d7d469411283531cfca13f332ae59e51693a7 (patch) | |
| tree | 0278564e4c84c72d80a2e33e020fc97e7cae3a40 /intern | |
| parent | df88d54284338777d67d2cb1f760e70a1ee6a497 (diff) | |
Cycles: Fix possibly uninitialized variable
Hopefully this was a reason of randomly disappearing textures in our renders.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/image.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index fd8a1262208..8985431b68a 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -285,9 +285,8 @@ int ImageManager::add_image(const string& filename, thread_scoped_lock device_lock(device_mutex); - /* Do we have a float? */ - if(type == IMAGE_DATA_TYPE_FLOAT || type == IMAGE_DATA_TYPE_FLOAT4) - is_float = true; + /* Check whether it's a float texture. */ + is_float = (type == IMAGE_DATA_TYPE_FLOAT || type == IMAGE_DATA_TYPE_FLOAT4); /* No single channel and half textures on CUDA (Fermi) and no half on OpenCL, use available slots */ if((type == IMAGE_DATA_TYPE_FLOAT || |