diff options
| author | Tianwei Shen <shentianweipku@gmail.com> | 2017-04-15 16:44:48 +0300 |
|---|---|---|
| committer | Tianwei Shen <shentianweipku@gmail.com> | 2017-04-15 16:44:48 +0300 |
| commit | f11ff0e672b8df79cdab85c8bebbd8c36c2c1cff (patch) | |
| tree | c80138a7af123907c3eb26fee978644c702795cf /intern/cycles/bvh/bvh_sort.cpp | |
| parent | 473653f33798b727148e8f6379f31cbba95de479 (diff) | |
| parent | 97c9c6a3f321f35f0b58ab167aea97a790c94cfb (diff) | |
Merge branch 'master' into soc-2016-multiviewsoc-2016-multiview
Diffstat (limited to 'intern/cycles/bvh/bvh_sort.cpp')
| -rw-r--r-- | intern/cycles/bvh/bvh_sort.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/intern/cycles/bvh/bvh_sort.cpp b/intern/cycles/bvh/bvh_sort.cpp index e5bcf9995bf..3a01061b285 100644 --- a/intern/cycles/bvh/bvh_sort.cpp +++ b/intern/cycles/bvh/bvh_sort.cpp @@ -15,12 +15,13 @@ * limitations under the License. */ -#include "bvh_build.h" -#include "bvh_sort.h" +#include "bvh/bvh_sort.h" -#include "util_algorithm.h" -#include "util_debug.h" -#include "util_task.h" +#include "bvh/bvh_build.h" + +#include "util/util_algorithm.h" +#include "util/util_debug.h" +#include "util/util_task.h" CCL_NAMESPACE_BEGIN |