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:
authorJacques Lucke <jacques@blender.org>2020-08-07 11:04:57 +0300
committerJacques Lucke <jacques@blender.org>2020-08-07 11:04:57 +0300
commit7283e6fb73490ddd23425ba2cf06cda7ac8f9458 (patch)
tree7c0c7069a44743b7462d3ed271bedeb09300ec4f /source/blender/io/collada/ErrorHandler.h
parent21fec951396982807d9cbe3852c58dbc898a809c (diff)
parent91694b9b58ab953f3b313be9389cc1303e472fc2 (diff)
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/io/collada/ErrorHandler.h')
-rw-r--r--source/blender/io/collada/ErrorHandler.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/io/collada/ErrorHandler.h b/source/blender/io/collada/ErrorHandler.h
index 0c082a3b9dd..60253a08cda 100644
--- a/source/blender/io/collada/ErrorHandler.h
+++ b/source/blender/io/collada/ErrorHandler.h
@@ -18,8 +18,7 @@
* \ingroup collada
*/
-#ifndef __ERRORHANDLER_H__
-#define __ERRORHANDLER_H__
+#pragma once
#include <algorithm> // sort()
#include <map>
@@ -53,5 +52,3 @@ class ErrorHandler : public COLLADASaxFWL::IErrorHandler {
/** Hold error status. */
bool mError;
};
-
-#endif /* __ERRORHANDLER_H__ */