summaryrefslogtreecommitdiff
path: root/scene/io
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-07-30 22:53:40 +0200
committerRémi Verschelde <rverschelde@gmail.com>2017-07-30 22:53:40 +0200
commit76005a8e75d4e63ad0477e11dbc8cc1c86666875 (patch)
treee177bf6b716fe267ac39ec3047ff0a2156e0a59b /scene/io
parent55494073081bd111dc6af8502f77cf344c64b56c (diff)
Style: Apply clang-format on all files
Thus fixing some invalid changes that had still made it to the master branch.
Diffstat (limited to 'scene/io')
-rw-r--r--scene/io/resource_format_image.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/io/resource_format_image.cpp b/scene/io/resource_format_image.cpp
index 8b3f939f1a..04b6177c3c 100644
--- a/scene/io/resource_format_image.cpp
+++ b/scene/io/resource_format_image.cpp
@@ -30,9 +30,9 @@
#include "resource_format_image.h"
#if 0
-#include "project_settings.h"
#include "io/image_loader.h"
#include "os/os.h"
+#include "project_settings.h"
#include "scene/resources/texture.h"
RES ResourceFormatLoaderImage::load(const String &p_path, const String& p_original_path, Error *r_error) {