diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:03 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:58 +0300 |
| commit | 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch) | |
| tree | ec50d7bdca3901a6afcc986943011f08f9516307 /intern/cycles/kernel/osl | |
| parent | 008aaaa37841ca27d2bba80d8859336655cef455 (diff) | |
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'intern/cycles/kernel/osl')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_closures.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/osl_globals.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/osl/osl_closures.h b/intern/cycles/kernel/osl/osl_closures.h index d3db6b71f5c..d12afdb80dd 100644 --- a/intern/cycles/kernel/osl/osl_closures.h +++ b/intern/cycles/kernel/osl/osl_closures.h @@ -33,12 +33,12 @@ #ifndef __OSL_CLOSURES_H__ #define __OSL_CLOSURES_H__ -#include "util/util_types.h" #include "kernel/kernel_types.h" +#include "util/util_types.h" +#include <OSL/genclosure.h> #include <OSL/oslclosure.h> #include <OSL/oslexec.h> -#include <OSL/genclosure.h> CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/osl_globals.h index 0e6c8d21534..c06c9abd4c1 100644 --- a/intern/cycles/kernel/osl/osl_globals.h +++ b/intern/cycles/kernel/osl/osl_globals.h @@ -27,8 +27,8 @@ # include "util/util_map.h" # include "util/util_param.h" # include "util/util_thread.h" -# include "util/util_vector.h" # include "util/util_unique_ptr.h" +# include "util/util_vector.h" # ifndef WIN32 using std::isfinite; diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index 469c5188730..d32dace23bf 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -25,8 +25,8 @@ * attributes. */ -#include <OSL/oslexec.h> #include <OSL/oslclosure.h> +#include <OSL/oslexec.h> #ifdef WITH_PTEX class PtexCache; |