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/python/gpu/gpu_py_api.h
+++ b/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__ */