[Bf-blender-cvs] [ac4d6fc] soc-2014-cycles: Merge remote-tracking branch 'origin/master' into soc-2014-cycles

[Thomas Dinges]

Commit: ac4d6fc6b789b8c058fa895061b1b2f95f6c3108
Author: Thomas Dinges
Date:   Wed Jul 2 00:18:02 2014 +0200
https://developer.blender.org/rBac4d6fc6b789b8c058fa895061b1b2f95f6c3108

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

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



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

diff --cc intern/cycles/kernel/CMakeLists.txt
index 4eb8be2,2ff6b53..6fbb11d
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@@ -113,9 -113,9 +113,10 @@@ set(SRC_GEOM_HEADER
  	geom/geom.h
  	geom/geom_attribute.h
  	geom/geom_bvh.h
+ 	geom/geom_bvh_shadow.h
  	geom/geom_bvh_subsurface.h
  	geom/geom_bvh_traversal.h
 +	geom/geom_qbvh_traversal.h
  	geom/geom_curve.h
  	geom/geom_motion_curve.h
  	geom/geom_motion_triangle.h