archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

code cleanup: function naming for BLI functions.

Browse Source
This commit is contained in:
Campbell Barton
2012-05-05 00:23:55 +00:00
parent 9466af0eab
commit 4c5502bfd6
42 changed files with 222 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/python/intern/bpy.c
View File

@@ -125,13 +125,13 @@ static PyObject *bpy_blend_paths(PyObject *UNUSED(self), PyObject *args, PyObjec
return NULL;
}
if (absolute) flag |= BPATH_TRAVERSE_ABS;
if (!packed) flag |= BPATH_TRAVERSE_SKIP_PACKED;
if (local) flag |= BPATH_TRAVERSE_SKIP_LIBRARY;
if (absolute) flag |= BLI_BPATH_TRAVERSE_ABS;
if (!packed) flag |= BLI_BPATH_TRAVERSE_SKIP_PACKED;
if (local) flag |= BLI_BPATH_TRAVERSE_SKIP_LIBRARY;
list = PyList_New(0);
bpath_traverse_main(G.main, bpy_blend_paths_visit_cb, flag, (void *)list);
BLI_bpath_traverse_main(G.main, bpy_blend_paths_visit_cb, flag, (void *)list);
return list;
}

2
source/blender/python/intern/bpy_app_handlers.c
View File

@@ -225,7 +225,7 @@ PyObject *BPY_app_handlers_struct(void)
funcstore->func = bpy_app_generic_callback;
funcstore->alloc = 0;
funcstore->arg = SET_INT_IN_POINTER(pos);
BLI_add_cb(funcstore, pos);
BLI_callback_add(funcstore, pos);
}
}

14
source/blender/python/mathutils/mathutils_geometry.c
View File

@@ -1150,11 +1150,11 @@ static PyObject *M_Geometry_tessellate_polygon(PyObject *UNUSED(self), PyObject
}
static int boxPack_FromPyObject(PyObject *value, boxPack **boxarray)
static int boxPack_FromPyObject(PyObject *value, BoxPack **boxarray)
{
Py_ssize_t len, i;
PyObject *list_item, *item_1, *item_2;
boxPack *box;
BoxPack *box;
/* Error checking must already be done */
@@ -1166,7 +1166,7 @@ static int boxPack_FromPyObject(PyObject *value, boxPack **boxarray)
len = PyList_GET_SIZE(value);
*boxarray = MEM_mallocN(len * sizeof(boxPack), "boxPack box");
*boxarray = MEM_mallocN(len * sizeof(BoxPack), "BoxPack box");
for (i = 0; i < len; i++) {
@@ -1201,11 +1201,11 @@ static int boxPack_FromPyObject(PyObject *value, boxPack **boxarray)
return 0;
}
static void boxPack_ToPyObject(PyObject *value, boxPack **boxarray)
static void boxPack_ToPyObject(PyObject *value, BoxPack **boxarray)
{
Py_ssize_t len, i;
PyObject *list_item;
boxPack *box;
BoxPack *box;
len = PyList_GET_SIZE(value);
@@ -1243,13 +1243,13 @@ static PyObject *M_Geometry_box_pack_2d(PyObject *UNUSED(self), PyObject *boxlis
len = PyList_GET_SIZE(boxlist);
if (len) {
boxPack *boxarray = NULL;
BoxPack *boxarray = NULL;
if (boxPack_FromPyObject(boxlist, &boxarray) == -1) {
return NULL; /* exception set */
}
/* Non Python function */
boxPack2D(boxarray, len, &tot_width, &tot_height);
BLI_box_pack_2D(boxarray, len, &tot_width, &tot_height);
boxPack_ToPyObject(boxlist, &boxarray);
}