diff options
Diffstat (limited to 'intern/cycles/app')
-rw-r--r-- | intern/cycles/app/cycles_server.cpp | 14 | ||||
-rw-r--r-- | intern/cycles/app/cycles_standalone.cpp | 26 | ||||
-rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 16 | ||||
-rw-r--r-- | intern/cycles/app/oiio_output_driver.h | 10 |
4 files changed, 33 insertions, 33 deletions
diff --git a/intern/cycles/app/cycles_server.cpp b/intern/cycles/app/cycles_server.cpp index 1ad70a376ed..38771b8aed8 100644 --- a/intern/cycles/app/cycles_server.cpp +++ b/intern/cycles/app/cycles_server.cpp @@ -18,13 +18,13 @@ #include "device/device.h" -#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/args.h" +#include "util/foreach.h" +#include "util/log.h" +#include "util/path.h" +#include "util/stats.h" +#include "util/string.h" +#include "util/task.h" using namespace ccl; diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index 800227ccf48..0032938b116 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -23,24 +23,24 @@ #include "session/buffers.h" #include "session/session.h" -#include "util/util_args.h" -#include "util/util_foreach.h" -#include "util/util_function.h" -#include "util/util_image.h" -#include "util/util_logging.h" -#include "util/util_path.h" -#include "util/util_progress.h" -#include "util/util_string.h" -#include "util/util_time.h" -#include "util/util_transform.h" -#include "util/util_unique_ptr.h" -#include "util/util_version.h" +#include "util/args.h" +#include "util/foreach.h" +#include "util/function.h" +#include "util/image.h" +#include "util/log.h" +#include "util/path.h" +#include "util/progress.h" +#include "util/string.h" +#include "util/time.h" +#include "util/transform.h" +#include "util/unique_ptr.h" +#include "util/version.h" #include "app/cycles_xml.h" #include "app/oiio_output_driver.h" #ifdef WITH_CYCLES_STANDALONE_GUI -# include "util/util_view.h" +# include "util/view.h" #endif #include "app/cycles_xml.h" diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 1ced74b6136..6144d2c60a9 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -35,14 +35,14 @@ #include "scene/shader_graph.h" #include "scene/shader_nodes.h" -#include "subd/subd_patch.h" -#include "subd/subd_split.h" - -#include "util/util_foreach.h" -#include "util/util_path.h" -#include "util/util_projection.h" -#include "util/util_transform.h" -#include "util/util_xml.h" +#include "subd/patch.h" +#include "subd/split.h" + +#include "util/foreach.h" +#include "util/path.h" +#include "util/projection.h" +#include "util/transform.h" +#include "util/xml.h" #include "app/cycles_xml.h" diff --git a/intern/cycles/app/oiio_output_driver.h b/intern/cycles/app/oiio_output_driver.h index a6984938fe7..a5c88e0e890 100644 --- a/intern/cycles/app/oiio_output_driver.h +++ b/intern/cycles/app/oiio_output_driver.h @@ -16,11 +16,11 @@ #include "session/output_driver.h" -#include "util/util_function.h" -#include "util/util_image.h" -#include "util/util_string.h" -#include "util/util_unique_ptr.h" -#include "util/util_vector.h" +#include "util/function.h" +#include "util/image.h" +#include "util/string.h" +#include "util/unique_ptr.h" +#include "util/vector.h" CCL_NAMESPACE_BEGIN |