From d07bc44a96ce6838cd25edca61127021fbebe4d1 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 3 Jan 2019 00:55:07 +1100
Subject: [PATCH] Revert file rename from T59773 fix

Mixing file rename with other changes should be avoided.

Using 'module_py_api' convention here
is in keeping with imbuf, idprop, blf & bmesh.
No reason for gpu to have a different convention.
---
 source/blender/python/gpu/CMakeLists.txt             | 4 ++--
 source/blender/python/gpu/{gpu_py.c => gpu_py_api.c} | 2 +-
 source/blender/python/gpu/{gpu_py.h => gpu_py_api.h} | 6 +++---
 source/blender/python/gpu/gpu_py_batch.c             | 2 +-
 source/blender/python/gpu/gpu_py_element.c           | 2 +-
 source/blender/python/gpu/gpu_py_offscreen.c         | 2 +-
 source/blender/python/gpu/gpu_py_shader.c            | 2 +-
 source/blender/python/intern/bpy_interface.c         | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)
 rename source/blender/python/gpu/{gpu_py.c => gpu_py_api.c} (98%)
 rename source/blender/python/gpu/{gpu_py.h => gpu_py_api.h} (92%)

diff --git a/source/blender/python/gpu/CMakeLists.txt b/source/blender/python/gpu/CMakeLists.txt
index fb5eb07a7d8..fcb0b828ffb 100644
--- a/source/blender/python/gpu/CMakeLists.txt
+++ b/source/blender/python/gpu/CMakeLists.txt
@@ -34,7 +34,7 @@ set(INC_SYS
 )
 
 set(SRC
-	gpu_py.c
+	gpu_py_api.c
 	gpu_py_batch.c
 	gpu_py_element.c
 	gpu_py_matrix.c
@@ -45,7 +45,7 @@ set(SRC
 	gpu_py_vertex_buffer.c
 	gpu_py_vertex_format.c
 
-	gpu_py.h
+	gpu_py_api.h
 	gpu_py_batch.h
 	gpu_py_element.h
 	gpu_py_matrix.h
diff --git a/source/blender/python/gpu/gpu_py.c b/source/blender/python/gpu/gpu_py_api.c
similarity index 98%
rename from source/blender/python/gpu/gpu_py.c
rename to source/blender/python/gpu/gpu_py_api.c
index 5470e791011..f237561246a 100644
--- a/source/blender/python/gpu/gpu_py.c
+++ b/source/blender/python/gpu/gpu_py_api.c
@@ -41,7 +41,7 @@
 #include "gpu_py_select.h"
 #include "gpu_py_types.h"
 
-#include "gpu_py.h" /* own include */
+#include "gpu_py_api.h" /* own include */
 
 
 /* -------------------------------------------------------------------- */
diff --git a/source/blender/python/gpu/gpu_py.h b/source/blender/python/gpu/gpu_py_api.h
similarity index 92%
rename from source/blender/python/gpu/gpu_py.h
rename to source/blender/python/gpu/gpu_py_api.h
index d3ee7b56def..2b4d8fa515c 100644
--- a/source/blender/python/gpu/gpu_py.h
+++ b/source/blender/python/gpu/gpu_py_api.h
@@ -22,8 +22,8 @@
  *  \ingroup bpygpu
  */
 
-#ifndef __GPU_PY_H__
-#define __GPU_PY_H__
+#ifndef __GPU_PY_API_H__
+#define __GPU_PY_API_H__
 
 bool bpygpu_is_initialized(void);
 
@@ -31,4 +31,4 @@ int bpygpu_ParsePrimType(PyObject *o, void *p);
 
 PyObject *BPyInit_gpu(void);
 
-#endif  /* __GPU_PY_H__ */
+#endif  /* __GPU_PY_API_H__ */
diff --git a/source/blender/python/gpu/gpu_py_batch.c b/source/blender/python/gpu/gpu_py_batch.c
index aa687ecaff5..93274e33cc4 100644
--- a/source/blender/python/gpu/gpu_py_batch.c
+++ b/source/blender/python/gpu/gpu_py_batch.c
@@ -44,7 +44,7 @@
 
 #include "../generic/py_capi_utils.h"
 
-#include "gpu_py.h"
+#include "gpu_py_api.h"
 #include "gpu_py_shader.h"
 #include "gpu_py_vertex_buffer.h"
 #include "gpu_py_element.h"
diff --git a/source/blender/python/gpu/gpu_py_element.c b/source/blender/python/gpu/gpu_py_element.c
index b996e859bc7..592c761ffbc 100644
--- a/source/blender/python/gpu/gpu_py_element.c
+++ b/source/blender/python/gpu/gpu_py_element.c
@@ -36,7 +36,7 @@
 #include "../generic/py_capi_utils.h"
 #include "../generic/python_utildefines.h"
 
-#include "gpu_py.h"
+#include "gpu_py_api.h"
 #include "gpu_py_element.h" /* own include */
 
 
diff --git a/source/blender/python/gpu/gpu_py_offscreen.c b/source/blender/python/gpu/gpu_py_offscreen.c
index 2725b55a5da..3ce90c5d648 100644
--- a/source/blender/python/gpu/gpu_py_offscreen.c
+++ b/source/blender/python/gpu/gpu_py_offscreen.c
@@ -53,7 +53,7 @@
 
 #include "../generic/py_capi_utils.h"
 
-#include "gpu_py.h"
+#include "gpu_py_api.h"
 #include "gpu_py_offscreen.h" /* own include */
 
 
diff --git a/source/blender/python/gpu/gpu_py_shader.c b/source/blender/python/gpu/gpu_py_shader.c
index 3c50900c688..59a416a0c3a 100644
--- a/source/blender/python/gpu/gpu_py_shader.c
+++ b/source/blender/python/gpu/gpu_py_shader.c
@@ -36,7 +36,7 @@
 #include "../generic/python_utildefines.h"
 #include "../mathutils/mathutils.h"
 
-#include "gpu_py.h"
+#include "gpu_py_api.h"
 #include "gpu_py_shader.h" /* own include */
 #include "gpu_py_vertex_format.h"
 
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 3b4e8c0904c..e17e7562f2a 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -74,7 +74,7 @@
 #include "../generic/blf_py_api.h"
 #include "../generic/idprop_py_api.h"
 #include "../generic/imbuf_py_api.h"
-#include "../gpu/gpu_py.h"
+#include "../gpu/gpu_py_api.h"
 #include "../bmesh/bmesh_py_api.h"
 #include "../mathutils/mathutils.h"