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

6 files changed, 6 insertions, 24 deletions

diff --git a/source/blender/python/generic/bgl.h b/source/blender/python/generic/bgl.h
index 8c81dc48340..ee8c293945a 100644
--- a/source/blender/python/generic/bgl.h
+++ b/source/blender/python/generic/bgl.h
@@ -18,8 +18,7 @@
  * \ingroup pygen
  */
 
-#ifndef __BGL_H__
-#define __BGL_H__
+#pragma once
 
 PyObject *BPyInit_bgl(void);
 
@@ -52,5 +51,3 @@ typedef struct _Buffer {
 
 /** The type object */
 extern PyTypeObject BGL_bufferType;
-
-#endif /* __BGL_H__ */
diff --git a/source/blender/python/generic/bl_math_py_api.h b/source/blender/python/generic/bl_math_py_api.h
index 9183573abfc..484304948f3 100644
--- a/source/blender/python/generic/bl_math_py_api.h
+++ b/source/blender/python/generic/bl_math_py_api.h
@@ -19,9 +19,6 @@
  * \ingroup pygen
  */
 
-#ifndef __BL_MATH_PY_API_H__
-#define __BL_MATH_PY_API_H__
+#pragma once
 
 PyMODINIT_FUNC BPyInit_bl_math(void);
-
-#endif /* __BL_MATH_PY_API_H__ */
diff --git a/source/blender/python/generic/blf_py_api.h b/source/blender/python/generic/blf_py_api.h
index 919272df942..c47edd1eaab 100644
--- a/source/blender/python/generic/blf_py_api.h
+++ b/source/blender/python/generic/blf_py_api.h
@@ -14,8 +14,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __BLF_PY_API_H__
-#define __BLF_PY_API_H__
+#pragma once
 
 /** \file
  * \ingroup pygen
@@ -24,5 +23,3 @@
 #include <Python.h>
 
 PyObject *BPyInit_blf(void);
-
-#endif /* __BLF_PY_API_H__ */
diff --git a/source/blender/python/generic/idprop_py_api.h b/source/blender/python/generic/idprop_py_api.h
index 49094f95ecb..478dc99f73d 100644
--- a/source/blender/python/generic/idprop_py_api.h
+++ b/source/blender/python/generic/idprop_py_api.h
@@ -18,8 +18,7 @@
  * \ingroup pygen
  */
 
-#ifndef __IDPROP_PY_API_H__
-#define __IDPROP_PY_API_H__
+#pragma once
 
 struct BPy_IDGroup_Iter;
 struct ID;
@@ -68,5 +67,3 @@ PyObject *BPyInit_idprop(void);
 
 #define IDPROP_ITER_KEYS 0
 #define IDPROP_ITER_ITEMS 1
-
-#endif /* __IDPROP_PY_API_H__ */
diff --git a/source/blender/python/generic/imbuf_py_api.h b/source/blender/python/generic/imbuf_py_api.h
index 2dea925a9f2..897423415b3 100644
--- a/source/blender/python/generic/imbuf_py_api.h
+++ b/source/blender/python/generic/imbuf_py_api.h
@@ -14,8 +14,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef __IMBUF_PY_API_H__
-#define __IMBUF_PY_API_H__
+#pragma once
 
 /** \file
  * \ingroup pygen
@@ -24,5 +23,3 @@
 PyObject *BPyInit_imbuf(void);
 
 extern PyTypeObject Py_ImBuf_Type;
-
-#endif /* __IMBUF_PY_API_H__ */
diff --git a/source/blender/python/generic/python_utildefines.h b/source/blender/python/generic/python_utildefines.h
index 653122c9c33..1f093e633e4 100644
--- a/source/blender/python/generic/python_utildefines.h
+++ b/source/blender/python/generic/python_utildefines.h
@@ -20,8 +20,7 @@
  * \note light addition to Python.h, use py_capi_utils.h for larger features.
  */
 
-#ifndef __PYTHON_UTILDEFINES_H__
-#define __PYTHON_UTILDEFINES_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,5 +56,3 @@ Py_LOCAL_INLINE(int) PyList_APPEND(PyObject *op, PyObject *v)
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __PYTHON_UTILDEFINES_H__ */