[Bf-blender-cvs] [db72639] master: Cleanup: Fix Cycles compile warning on MSVC.

Thomas Dinges noreply at git.blender.org
Thu Jan 7 00:27:04 CET 2016


Commit: db72639e1f452014b7ac4e251946ee716a3fb507
Author: Thomas Dinges
Date:   Thu Jan 7 00:26:26 2016 +0100
Branches: master
https://developer.blender.org/rBdb72639e1f452014b7ac4e251946ee716a3fb507

Cleanup: Fix Cycles compile warning on MSVC.

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

M	intern/cycles/render/shader.cpp

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

diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 556fbe4..d6e854b 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);




More information about the Bf-blender-cvs mailing list