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:
Diffstat (limited to 'intern/cycles/session/merge.cpp')
-rw-r--r--intern/cycles/session/merge.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/session/merge.cpp b/intern/cycles/session/merge.cpp
index 97e9c75d5f7..5890c15f48c 100644
--- a/intern/cycles/session/merge.cpp
+++ b/intern/cycles/session/merge.cpp
@@ -16,11 +16,11 @@
#include "session/merge.h"
-#include "util/util_array.h"
-#include "util/util_map.h"
-#include "util/util_system.h"
-#include "util/util_time.h"
-#include "util/util_unique_ptr.h"
+#include "util/array.h"
+#include "util/map.h"
+#include "util/system.h"
+#include "util/time.h"
+#include "util/unique_ptr.h"
#include <OpenImageIO/filesystem.h>
#include <OpenImageIO/imageio.h>