[Bf-blender-cvs] [394f0391cc] temp-cycles-denoising: Merge remote-tracking branch 'origin/master' into temp-cycles-denoising

[Lukas Stockner]

Commit: 394f0391cc45b1b43f569a040ab4064978e35b3b
Author: Lukas Stockner
Date:   Fri Mar 24 16:31:45 2017 +0100
Branches: temp-cycles-denoising
https://developer.blender.org/rB394f0391cc45b1b43f569a040ab4064978e35b3b

Merge remote-tracking branch 'origin/master' into temp-cycles-denoising

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



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

diff --cc intern/cycles/kernel/CMakeLists.txt
index 7495f3e0a3,8a8c3968c0..59ce13f86f
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@@ -206,7 -196,7 +206,8 @@@ set(SRC_UTIL_HEADER
  	../util/util_hash.h
  	../util/util_math.h
  	../util/util_math_fast.h
+ 	../util/util_math_intersect.h
 +	../util/util_math_matrix.h
  	../util/util_static_assert.h
  	../util/util_transform.h
  	../util/util_texture.h
diff --cc intern/cycles/util/CMakeLists.txt
index fb78e4c343,6bd4712048..5108a5c869
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@@ -52,7 -52,7 +52,8 @@@ set(SRC_HEADER
  	util_math.h
  	util_math_cdf.h
  	util_math_fast.h
+ 	util_math_intersect.h
 +	util_math_matrix.h
  	util_md5.h
  	util_opengl.h
  	util_optimization.h