[Bf-blender-cvs] [bf7e4067663] master: Cycles: Fix optimal BVH selection.

[Ray Molenkamp]

Commit: bf7e4067663cec0a3b4d3194e89a28aa62b39773
Author: Ray Molenkamp
Date:   Mon Jan 22 14:52:09 2018 -0700
Branches: master
https://developer.blender.org/rBbf7e4067663cec0a3b4d3194e89a28aa62b39773

Cycles: Fix optimal BVH selection.

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

M	intern/cycles/bvh/bvh.cpp

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

diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp
index 5bfe9d4ed1a..b524ca07d8d 100644
--- a/intern/cycles/bvh/bvh.cpp
+++ b/intern/cycles/bvh/bvh.cpp
@@ -63,7 +63,7 @@ BVHLayout BVHParams::best_bvh_layout(BVHLayout requested_layout,
 	        (supported_layouts & (requested_layout_mask - 1));
 	/* We get widest from allowed ones and convert mask to actual layout. */
 	const BVHLayoutMask widest_allowed_layout_mask = __bsr(allowed_layouts_mask);
-	return (BVHLayout)widest_allowed_layout_mask;
+	return (BVHLayout)(1 << widest_allowed_layout_mask);
 }
 
 /* Pack Utility */