Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-03-06 16:15:21 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-03-06 16:44:42 +0300
commitc8ac760c590aee184aba3a0fbd8110d0aad2fe97 (patch)
tree9480848f1c4f8f233681cb0311ee12b8a9a34af5 /intern/cycles/kernel/split
parent4102d67d32ad2d8411d1ef15e80d3373f36e262b (diff)
Cleanup: tweak Cycles #includes in preparation for clang-format sorting
Diffstat (limited to 'intern/cycles/kernel/split')
-rw-r--r--intern/cycles/kernel/split/kernel_split_common.h2
-rw-r--r--intern/cycles/kernel/split/kernel_split_data.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/split/kernel_split_common.h b/intern/cycles/kernel/split/kernel_split_common.h
index 384bc952460..5114f2b03e5 100644
--- a/intern/cycles/kernel/split/kernel_split_common.h
+++ b/intern/cycles/kernel/split/kernel_split_common.h
@@ -17,6 +17,7 @@
#ifndef __KERNEL_SPLIT_H__
#define __KERNEL_SPLIT_H__
+// clang-format off
#include "kernel/kernel_math.h"
#include "kernel/kernel_types.h"
@@ -52,6 +53,7 @@
#ifdef __BRANCHED_PATH__
# include "kernel/split/kernel_branched.h"
#endif
+// clang-format on
CCL_NAMESPACE_BEGIN
diff --git a/intern/cycles/kernel/split/kernel_split_data.h b/intern/cycles/kernel/split/kernel_split_data.h
index 433b1221a37..decc537b39b 100644
--- a/intern/cycles/kernel/split/kernel_split_data.h
+++ b/intern/cycles/kernel/split/kernel_split_data.h
@@ -18,6 +18,7 @@
#define __KERNEL_SPLIT_DATA_H__
#include "kernel/split/kernel_split_data_types.h"
+
#include "kernel/kernel_globals.h"
CCL_NAMESPACE_BEGIN