[Bf-blender-cvs] [b5b0804c5a3] master: Cleanup: use _ex suffix instead of _ext

Campbell Barton noreply at git.blender.org
Thu Aug 1 10:40:01 CEST 2019


Commit: b5b0804c5a3bc20e39bddeb052f5f671c8dbc497
Author: Campbell Barton
Date:   Thu Aug 1 18:34:52 2019 +1000
Branches: master
https://developer.blender.org/rBb5b0804c5a3bc20e39bddeb052f5f671c8dbc497

Cleanup: use _ex suffix instead of _ext

Convention is to use ex, not ext for extended
versions of a functions.

===================================================================

M	source/blender/python/intern/bpy_interface_atexit.c
M	source/blender/python/mathutils/mathutils_Vector.c
M	source/blender/windowmanager/WM_api.h
M	source/blender/windowmanager/intern/wm_init_exit.c
M	source/creator/creator.c

===================================================================

diff --git a/source/blender/python/intern/bpy_interface_atexit.c b/source/blender/python/intern/bpy_interface_atexit.c
index 1c48dc1baae..4a43d4e6853 100644
--- a/source/blender/python/intern/bpy_interface_atexit.c
+++ b/source/blender/python/intern/bpy_interface_atexit.c
@@ -36,7 +36,7 @@ static PyObject *bpy_atexit(PyObject *UNUSED(self), PyObject *UNUSED(args), PyOb
   /* close down enough of blender at least not to crash */
   struct bContext *C = BPy_GetContext();
 
-  WM_exit_ext(C, 0);
+  WM_exit_ex(C, false);
 
   Py_RETURN_NONE;
 }
diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c
index 2c9a25d24bc..1f17d1eebf2 100644
--- a/source/blender/python/mathutils/mathutils_Vector.c
+++ b/source/blender/python/mathutils/mathutils_Vector.c
@@ -47,7 +47,7 @@
 
 static PyObject *Vector_copy(VectorObject *self);
 static PyObject *Vector_deepcopy(VectorObject *self, PyObject *args);
-static PyObject *Vector_to_tuple_ext(VectorObject *self, int ndigits);
+static PyObject *Vector_to_tuple_ex(VectorObject *self, int ndigits);
 static int row_vector_multiplication(float rvec[MAX_DIMENSIONS],
                                      VectorObject *vec,
                                      MatrixObject *mat);
@@ -630,7 +630,7 @@ PyDoc_STRVAR(Vector_to_tuple_doc,
              "   :return: the values of the vector rounded by *precision*\n"
              "   :rtype: tuple\n");
 /* note: BaseMath_ReadCallback must be called beforehand */
-static PyObject *Vector_to_tuple_ext(VectorObject *self, int ndigits)
+static PyObject *Vector_to_tuple_ex(VectorObject *self, int ndigits)
 {
   PyObject *ret;
   int i;
@@ -674,7 +674,7 @@ static PyObject *Vector_to_tuple(VectorObject *self, PyObject *args)
     return NULL;
   }
 
-  return Vector_to_tuple_ext(self, ndigits);
+  return Vector_to_tuple_ex(self, ndigits);
 }
 
 PyDoc_STRVAR(Vector_to_track_quat_doc,
@@ -1338,7 +1338,7 @@ static PyObject *Vector_repr(VectorObject *self)
     return NULL;
   }
 
-  tuple = Vector_to_tuple_ext(self, -1);
+  tuple = Vector_to_tuple_ex(self, -1);
   ret = PyUnicode_FromFormat("Vector(%R)", tuple);
   Py_DECREF(tuple);
   return ret;
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 9722f98d535..5d6e405dd5d 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -93,7 +93,7 @@ void WM_init_native_pixels(bool do_it);
 void WM_init_tablet_api(void);
 
 void WM_init(struct bContext *C, int argc, const char **argv);
-void WM_exit_ext(struct bContext *C, const bool do_python);
+void WM_exit_ex(struct bContext *C, const bool do_python);
 
 void WM_exit(struct bContext *C) ATTR_NORETURN;
 
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 763bdbb9cf0..29cb02888ac 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -467,7 +467,7 @@ void wm_exit_schedule_delayed(const bContext *C)
 /**
  * \note doesn't run exit() call #WM_exit() for that.
  */
-void WM_exit_ext(bContext *C, const bool do_python)
+void WM_exit_ex(bContext *C, const bool do_python)
 {
   wmWindowManager *wm = C ? CTX_wm_manager(C) : NULL;
 
@@ -666,7 +666,7 @@ void WM_exit_ext(bContext *C, const bool do_python)
  */
 void WM_exit(bContext *C)
 {
-  WM_exit_ext(C, 1);
+  WM_exit_ex(C, true);
 
   printf("\nBlender quit\n");
 
diff --git a/source/creator/creator.c b/source/creator/creator.c
index afcde70670a..d6e1d7e7f5f 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -496,7 +496,7 @@ int main(int argc,
 #ifdef WITH_PYTHON_MODULE
 void main_python_exit(void)
 {
-  WM_exit_ext((bContext *)evil_C, true);
+  WM_exit_ex((bContext *)evil_C, true);
   evil_C = NULL;
 }
 #endif



More information about the Bf-blender-cvs mailing list