[Bf-blender-cvs] [4c4d1d6] temp-cycles-microdisplacement: Merge branch 'master' into temp-cycles-microdisplacement

[Mai Lavelle]

Commit: 4c4d1d6b6dc4e790fa1d45c927f87a9cc8203f82
Author: Mai Lavelle
Date:   Wed Jul 13 22:41:30 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rB4c4d1d6b6dc4e790fa1d45c927f87a9cc8203f82

Merge branch 'master' into temp-cycles-microdisplacement

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



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

diff --cc intern/cycles/kernel/CMakeLists.txt
index d807bd7,bd3969b..f198817
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@@ -151,15 -160,7 +160,9 @@@ set(SRC_GEOM_HEADER
  	geom/geom_motion_curve.h
  	geom/geom_motion_triangle.h
  	geom/geom_object.h
 +	geom/geom_patch.h
  	geom/geom_primitive.h
- 	geom/geom_qbvh.h
- 	geom/geom_qbvh_shadow.h
- 	geom/geom_qbvh_subsurface.h
- 	geom/geom_qbvh_traversal.h
- 	geom/geom_qbvh_volume.h
- 	geom/geom_qbvh_volume_all.h
 +	geom/geom_subd_triangle.h
  	geom/geom_triangle.h
  	geom/geom_triangle_intersect.h
  	geom/geom_volume.h
diff --cc intern/cycles/kernel/geom/geom.h
index c0baa92,d2c7edb..1154832
--- a/intern/cycles/kernel/geom/geom.h
+++ b/intern/cycles/kernel/geom/geom.h
@@@ -15,19 -15,9 +15,11 @@@
   * limitations under the License.
   */
  
- /* bottom-most stack entry, indicating the end of traversal */
- #define ENTRYPOINT_SENTINEL 0x76543210
- 
- /* 64 object BVH + 64 mesh BVH + 64 object node splitting */
- #define BVH_STACK_SIZE 192
- #define BVH_QSTACK_SIZE 384
- #define TRI_NODE_SIZE 3
- 
  #include "geom_attribute.h"
  #include "geom_object.h"
 +#include "geom_patch.h"
  #include "geom_triangle.h"
 +#include "geom_subd_triangle.h"
  #include "geom_triangle_intersect.h"
  #include "geom_motion_triangle.h"
  #include "geom_motion_curve.h"