Revert file rename from T59773 fix
authorCampbell Barton <ideasman42@gmail.com>
Wed, 2 Jan 2019 13:55:07 +0000 (00:55 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 2 Jan 2019 13:55:07 +0000 (00:55 +1100)
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
source/blender/python/gpu/gpu_py_api.c [moved from source/blender/python/gpu/gpu_py.c with 98% similarity]
source/blender/python/gpu/gpu_py_api.h [moved from source/blender/python/gpu/gpu_py.h with 92% similarity]
source/blender/python/gpu/gpu_py_batch.c
source/blender/python/gpu/gpu_py_element.c
source/blender/python/gpu/gpu_py_offscreen.c
source/blender/python/gpu/gpu_py_shader.c
source/blender/python/intern/bpy_interface.c

index fb5eb07..fcb0b82 100644 (file)
@@ -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
similarity index 98%
rename from source/blender/python/gpu/gpu_py.c
rename to source/blender/python/gpu/gpu_py_api.c
index 5470e79..f237561 100644 (file)
@@ -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 */
 
 
 /* -------------------------------------------------------------------- */
similarity index 92%
rename from source/blender/python/gpu/gpu_py.h
rename to source/blender/python/gpu/gpu_py_api.h
index d3ee7b5..2b4d8fa 100644 (file)
@@ -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__ */
index aa687ec..93274e3 100644 (file)
@@ -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"
index b996e85..592c761 100644 (file)
@@ -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 */
 
 
index 2725b55..3ce90c5 100644 (file)
@@ -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 */
 
 
index 3c50900..59a416a 100644 (file)
@@ -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"
 
index 3b4e8c0..e17e756 100644 (file)
@@ -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"