Merge branch 'blender-v2.90-release' into master

2020-08-07 10:04:57 +02:00
parent 21fec95139 91694b9b58
commit 7283e6fb73
1401 changed files with 1497 additions and 5524 deletions
--- a/source/blender/functions/FN_multi_function_signature.hh
+++ b/source/blender/functions/FN_multi_function_signature.hh
@@ -14,8 +14,7 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#ifndef __FN_MULTI_FUNCTION_SIGNATURE_HH__
-#define __FN_MULTI_FUNCTION_SIGNATURE_HH__
+#pragma once

 /** \file
 * \ingroup fn
@@ -169,5 +168,3 @@ class MFSignatureBuilder {
 };

 }  // namespace blender::fn
-
-#endif /* __FN_MULTI_FUNCTION_SIGNATURE_HH__ */