[Bf-blender-cvs] [386da0c] master: Cycles: Avoid conversion from bool to uint

Sergey Sharybin noreply at git.blender.org
Tue Sep 20 13:00:40 CEST 2016


Commit: 386da0cc77cbd16a8b5a196dd1b44e517198dbda
Author: Sergey Sharybin
Date:   Tue Sep 20 13:00:16 2016 +0200
Branches: master
https://developer.blender.org/rB386da0cc77cbd16a8b5a196dd1b44e517198dbda

Cycles: Avoid conversion from bool to uint

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

M	intern/cycles/kernel/bvh/qbvh_volume_all.h

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

diff --git a/intern/cycles/kernel/bvh/qbvh_volume_all.h b/intern/cycles/kernel/bvh/qbvh_volume_all.h
index 26da014..5d9b2ed 100644
--- a/intern/cycles/kernel/bvh/qbvh_volume_all.h
+++ b/intern/cycles/kernel/bvh/qbvh_volume_all.h
@@ -69,7 +69,7 @@ ccl_device uint BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg,
 
 #ifndef __KERNEL_SSE41__
 	if(!isfinite(P.x)) {
-		return false;
+		return 0;
 	}
 #endif




More information about the Bf-blender-cvs mailing list