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/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -21,8 +21,7 @@
 * \ingroup editorui
 */

-#ifndef __UI_INTERFACE_H__
-#define __UI_INTERFACE_H__
+#pragma once

 #include "BLI_compiler_attrs.h"
 #include "BLI_sys_types.h" /* size_t */
@@ -2577,5 +2576,3 @@ void UI_interface_tag_script_reload(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __UI_INTERFACE_H__ */