Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2016-01-07 02:26:26 +0300
committerThomas Dinges <blender@dingto.org>2016-01-07 02:26:26 +0300
commitdb72639e1f452014b7ac4e251946ee716a3fb507 (patch)
tree949ec4f7c79e64297450db5a1909e043f896b3b7 /intern/cycles/render/shader.cpp
parent81a253a0d50d8a2e28e9e49104aaeff521fe98d6 (diff)
Cleanup: Fix Cycles compile warning on MSVC.
Diffstat (limited to 'intern/cycles/render/shader.cpp')
-rw-r--r--intern/cycles/render/shader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 556fbe4f78d..d6e854b0b5c 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -386,7 +386,7 @@ void ShaderManager::device_update_common(Device *device,
shader_flag[i++] = flag;
shader_flag[i++] = shader->pass_id;
- has_transparent_shadow |= (flag & SD_HAS_TRANSPARENT_SHADOW);
+ has_transparent_shadow = (flag & SD_HAS_TRANSPARENT_SHADOW) != 0;
}
device->tex_alloc("__shader_flag", dscene->shader_flag);