Merge branch 'v2.1' of https://github.com/embree/embree into v2.1

Author: svenwoop

kernels/xeon/bvh4i/bvh4i.cpp

@@ -52,8 +52,6 @@ namespace embree
   DECLARE_SYMBOL(Accel::Intersector8,BVH4iTriangle4vIntersector8ChunkPluecker);
   DECLARE_SYMBOL(Accel::Intersector8,BVH4iVirtualIntersector8Chunk);
 
-  DECLARE_SYMBOL(Accel::Intersector8,BVH4iTriangle4Intersector8HybridMoeller);
-
 
 #if defined(__TARGET_AVX2__)
   extern Accel::Intersector8 BVH4iTriangle1Intersector8ChunkAVX2;
@@ -94,8 +92,6 @@ namespace embree
     SELECT_SYMBOL_AVX_AVX2(features,BVH4iTriangle1vIntersector8ChunkPluecker);
     SELECT_SYMBOL_AVX_AVX2(features,BVH4iTriangle4vIntersector8ChunkPluecker);
     SELECT_SYMBOL_AVX_AVX2(features,BVH4iVirtualIntersector8Chunk);
-
-    SELECT_SYMBOL_AVX_AVX2(features,BVH4iTriangle4Intersector8HybridMoeller);
   }
 
   Accel::Intersectors BVH4iTriangle1Intersectors(BVH4i* bvh)
@@ -115,8 +111,7 @@ namespace embree
     intersectors.ptr = bvh;
     intersectors.intersector1 = BVH4iTriangle4Intersector1Moeller;
     intersectors.intersector4 = BVH4iTriangle4Intersector4ChunkMoeller;
-    //intersectors.intersector8 = BVH4iTriangle4Intersector8ChunkMoeller;
-    intersectors.intersector8 = BVH4iTriangle4Intersector8HybridMoeller;
+    intersectors.intersector8 = BVH4iTriangle4Intersector8ChunkMoeller;
     intersectors.intersector16 = NULL;
     return intersectors;
   }