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/app | |
| parent | 008aaaa37841ca27d2bba80d8859336655cef455 (diff) | |
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/cycles_cubin_cc.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/app/cycles_server.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/app/cycles_standalone.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/app/cycles_cubin_cc.cpp b/intern/cycles/app/cycles_cubin_cc.cpp index 774c18f4219..9d4d52b34ac 100644 --- a/intern/cycles/app/cycles_cubin_cc.cpp +++ b/intern/cycles/app/cycles_cubin_cc.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include <stdio.h> #include <stdint.h> +#include <stdio.h> #include <string> #include <vector> diff --git a/intern/cycles/app/cycles_server.cpp b/intern/cycles/app/cycles_server.cpp index c5a4c9b375b..1ad70a376ed 100644 --- a/intern/cycles/app/cycles_server.cpp +++ b/intern/cycles/app/cycles_server.cpp @@ -20,11 +20,11 @@ #include "util/util_args.h" #include "util/util_foreach.h" +#include "util/util_logging.h" #include "util/util_path.h" #include "util/util_stats.h" #include "util/util_string.h" #include "util/util_task.h" -#include "util/util_logging.h" using namespace ccl; diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index d2d112e8d7e..e45c37be494 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -16,12 +16,12 @@ #include <stdio.h> +#include "device/device.h" #include "render/buffers.h" #include "render/camera.h" -#include "device/device.h" +#include "render/integrator.h" #include "render/scene.h" #include "render/session.h" -#include "render/integrator.h" #include "util/util_args.h" #include "util/util_foreach.h" diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 11db5b1a07d..aec00f845f3 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -16,9 +16,9 @@ #include <stdio.h> -#include <sstream> #include <algorithm> #include <iterator> +#include <sstream> #include "graph/node_xml.h" @@ -32,8 +32,8 @@ #include "render/nodes.h" #include "render/object.h" #include "render/osl.h" -#include "render/shader.h" #include "render/scene.h" +#include "render/shader.h" #include "subd/subd_patch.h" #include "subd/subd_split.h" |