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

source/blender/python/gpu/gpu_py_api.h

@@ -18,8 +18,7 @@
  * \ingroup bpygpu
  */
 
-#ifndef __GPU_PY_API_H__
-#define __GPU_PY_API_H__
+#pragma once
 
 int bpygpu_ParsePrimType(PyObject *o, void *p);
 
@@ -36,5 +35,3 @@ bool bpygpu_is_init_or_error(void);
     return -1; \
   } \
   ((void)0)
-
-#endif /* __GPU_PY_API_H__ */

source/blender/python/gpu/gpu_py_batch.h

@@ -18,8 +18,7 @@
  * \ingroup bpygpu
  */
 
-#ifndef __GPU_PY_BATCH_H__
-#define __GPU_PY_BATCH_H__
+#pragma once
 
 #include "BLI_compiler_attrs.h"
 
@@ -40,5 +39,3 @@ typedef struct BPyGPUBatch {
 } BPyGPUBatch;
 
 PyObject *BPyGPUBatch_CreatePyObject(struct GPUBatch *batch) ATTR_NONNULL(1);
-
-#endif /* __GPU_PY_BATCH_H__ */

source/blender/python/gpu/gpu_py_element.h

@@ -18,8 +18,7 @@
  * \ingroup bpygpu
  */
 
-#ifndef __GPU_PY_ELEMENT_H__
-#define __GPU_PY_ELEMENT_H__
+#pragma once
 
 extern PyTypeObject BPyGPUIndexBuf_Type;
 
@@ -30,5 +29,3 @@ typedef struct BPyGPUIndexBuf {
 } BPyGPUIndexBuf;
 
 PyObject *BPyGPUIndexBuf_CreatePyObject(struct GPUIndexBuf *elem);
-
-#endif /* __GPU_PY_ELEMENT_H__ */

source/blender/python/gpu/gpu_py_matrix.h

@@ -18,9 +18,6 @@
  * \ingroup bpygpu
  */
 
-#ifndef __GPU_PY_MATRIX_H__
-#define __GPU_PY_MATRIX_H__
+#pragma once
 
 PyObject *BPyInit_gpu_matrix(void);
-
-#endif /* __GPU_PY_MATRIX_H__ */

source/blender/python/gpu/gpu_py_offscreen.h

@@ -18,8 +18,7 @@
  * \ingroup bpygpu
  */
 
-#ifndef __GPU_PY_OFFSCREEN_H__
-#define __GPU_PY_OFFSCREEN_H__
+#pragma once
 
 #include "BLI_compiler_attrs.h"
 
@@ -33,5 +32,3 @@ typedef struct BPyGPUOffScreen {
 } BPyGPUOffScreen;
 
 PyObject *BPyGPUOffScreen_CreatePyObject(struct GPUOffScreen *ofs) ATTR_NONNULL(1);
-
-#endif /* __GPU_PY_OFFSCREEN_H__ */

source/blender/python/gpu/gpu_py_select.h

@@ -18,9 +18,6 @@
  * \ingroup bpygpu
  */
 
-#ifndef __GPU_PY_SELECT_H__
-#define __GPU_PY_SELECT_H__
+#pragma once
 
 PyObject *BPyInit_gpu_select(void);
-
-#endif /* __GPU_PY_SELECT_H__ */

source/blender/python/gpu/gpu_py_shader.h

@@ -18,8 +18,7 @@
  * \ingroup bpygpu
  */
 
-#ifndef __GPU_PY_SHADER_H__
-#define __GPU_PY_SHADER_H__
+#pragma once
 
 extern PyTypeObject BPyGPUShader_Type;
 
@@ -32,5 +31,3 @@ typedef struct BPyGPUShader {
 
 PyObject *BPyGPUShader_CreatePyObject(struct GPUShader *shader, bool is_builtin);
 PyObject *BPyInit_gpu_shader(void);
-
-#endif /* __GPU_PY_SHADER_H__ */

source/blender/python/gpu/gpu_py_types.h

@@ -18,8 +18,7 @@
  * \ingroup bpygpu
  */
 
-#ifndef __GPU_PY_TYPES_H__
-#define __GPU_PY_TYPES_H__
+#pragma once
 
 #include "gpu_py_batch.h"
 #include "gpu_py_element.h"
@@ -29,5 +28,3 @@
 #include "gpu_py_vertex_format.h"
 
 PyObject *BPyInit_gpu_types(void);
-
-#endif /* __GPU_PY_TYPES_H__ */

source/blender/python/gpu/gpu_py_vertex_buffer.h

@@ -18,8 +18,7 @@
  * \ingroup bpygpu
  */
 
-#ifndef __GPU_PY_VERTEX_BUFFER_H__
-#define __GPU_PY_VERTEX_BUFFER_H__
+#pragma once
 
 #include "BLI_compiler_attrs.h"
 
@@ -34,5 +33,3 @@ typedef struct BPyGPUVertBuf {
 } BPyGPUVertBuf;
 
 PyObject *BPyGPUVertBuf_CreatePyObject(struct GPUVertBuf *vbo) ATTR_NONNULL(1);
-
-#endif /* __GPU_PY_VERTEX_BUFFER_H__ */

source/blender/python/gpu/gpu_py_vertex_format.h

@@ -18,8 +18,7 @@
  * \ingroup bpygpu
  */
 
-#ifndef __GPU_PY_VERTEX_FORMAT_H__
-#define __GPU_PY_VERTEX_FORMAT_H__
+#pragma once
 
 #include "GPU_vertex_format.h"
 
@@ -32,5 +31,3 @@ typedef struct BPyGPUVertFormat {
 } BPyGPUVertFormat;
 
 PyObject *BPyGPUVertFormat_CreatePyObject(struct GPUVertFormat *fmt);
-
-#endif /* __GPU_PY_VERTEX_FORMAT_H__ */