ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
This commit is contained in:
@@ -43,174 +43,177 @@
|
||||
|
||||
#include "../generic/py_capi_utils.h"
|
||||
|
||||
|
||||
PyDoc_STRVAR(bpy_lib_write_doc,
|
||||
".. method:: write(filepath, datablocks, relative_remap=False, fake_user=False, compress=False)\n"
|
||||
"\n"
|
||||
" Write data-blocks into a blend file.\n"
|
||||
"\n"
|
||||
" .. note::\n"
|
||||
"\n"
|
||||
" Indirectly referenced data-blocks will be expanded and written too.\n"
|
||||
"\n"
|
||||
" :arg filepath: The path to write the blend-file.\n"
|
||||
" :type filepath: string\n"
|
||||
" :arg datablocks: set of data-blocks (:class:`bpy.types.ID` instances).\n"
|
||||
" :type datablocks: set\n"
|
||||
" :arg relative_remap: When True, make paths relative to the current blend-file.\n"
|
||||
" :type relative_remap: bool\n"
|
||||
" :arg fake_user: When True, data-blocks will be written with fake-user flag enabled.\n"
|
||||
" :type fake_user: bool\n"
|
||||
" :arg compress: When True, write a compressed blend file.\n"
|
||||
" :type compress: bool\n"
|
||||
);
|
||||
PyDoc_STRVAR(
|
||||
bpy_lib_write_doc,
|
||||
".. method:: write(filepath, datablocks, relative_remap=False, fake_user=False, "
|
||||
"compress=False)\n"
|
||||
"\n"
|
||||
" Write data-blocks into a blend file.\n"
|
||||
"\n"
|
||||
" .. note::\n"
|
||||
"\n"
|
||||
" Indirectly referenced data-blocks will be expanded and written too.\n"
|
||||
"\n"
|
||||
" :arg filepath: The path to write the blend-file.\n"
|
||||
" :type filepath: string\n"
|
||||
" :arg datablocks: set of data-blocks (:class:`bpy.types.ID` instances).\n"
|
||||
" :type datablocks: set\n"
|
||||
" :arg relative_remap: When True, make paths relative to the current blend-file.\n"
|
||||
" :type relative_remap: bool\n"
|
||||
" :arg fake_user: When True, data-blocks will be written with fake-user flag enabled.\n"
|
||||
" :type fake_user: bool\n"
|
||||
" :arg compress: When True, write a compressed blend file.\n"
|
||||
" :type compress: bool\n");
|
||||
static PyObject *bpy_lib_write(PyObject *UNUSED(self), PyObject *args, PyObject *kw)
|
||||
{
|
||||
/* args */
|
||||
const char *filepath;
|
||||
char filepath_abs[FILE_MAX];
|
||||
PyObject *datablocks = NULL;
|
||||
bool use_relative_remap = false, use_fake_user = false, use_compress = false;
|
||||
/* args */
|
||||
const char *filepath;
|
||||
char filepath_abs[FILE_MAX];
|
||||
PyObject *datablocks = NULL;
|
||||
bool use_relative_remap = false, use_fake_user = false, use_compress = false;
|
||||
|
||||
static const char *_keywords[] = {
|
||||
"filepath", "datablocks",
|
||||
/* optional */
|
||||
"relative_remap", "fake_user", "compress",
|
||||
NULL,
|
||||
};
|
||||
static _PyArg_Parser _parser = {"sO!|$O&O&O&:write", _keywords, 0};
|
||||
if (!_PyArg_ParseTupleAndKeywordsFast(
|
||||
args, kw, &_parser,
|
||||
&filepath,
|
||||
&PySet_Type, &datablocks,
|
||||
PyC_ParseBool, &use_relative_remap,
|
||||
PyC_ParseBool, &use_fake_user,
|
||||
PyC_ParseBool, &use_compress))
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
static const char *_keywords[] = {
|
||||
"filepath",
|
||||
"datablocks",
|
||||
/* optional */
|
||||
"relative_remap",
|
||||
"fake_user",
|
||||
"compress",
|
||||
NULL,
|
||||
};
|
||||
static _PyArg_Parser _parser = {"sO!|$O&O&O&:write", _keywords, 0};
|
||||
if (!_PyArg_ParseTupleAndKeywordsFast(args,
|
||||
kw,
|
||||
&_parser,
|
||||
&filepath,
|
||||
&PySet_Type,
|
||||
&datablocks,
|
||||
PyC_ParseBool,
|
||||
&use_relative_remap,
|
||||
PyC_ParseBool,
|
||||
&use_fake_user,
|
||||
PyC_ParseBool,
|
||||
&use_compress)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Main *bmain_src = G_MAIN;
|
||||
int write_flags = 0;
|
||||
Main *bmain_src = G_MAIN;
|
||||
int write_flags = 0;
|
||||
|
||||
if (use_relative_remap) {
|
||||
write_flags |= G_FILE_RELATIVE_REMAP;
|
||||
}
|
||||
if (use_relative_remap) {
|
||||
write_flags |= G_FILE_RELATIVE_REMAP;
|
||||
}
|
||||
|
||||
if (use_compress) {
|
||||
write_flags |= G_FILE_COMPRESS;
|
||||
}
|
||||
if (use_compress) {
|
||||
write_flags |= G_FILE_COMPRESS;
|
||||
}
|
||||
|
||||
BLI_strncpy(filepath_abs, filepath, FILE_MAX);
|
||||
BLI_path_abs(filepath_abs, BKE_main_blendfile_path_from_global());
|
||||
BLI_strncpy(filepath_abs, filepath, FILE_MAX);
|
||||
BLI_path_abs(filepath_abs, BKE_main_blendfile_path_from_global());
|
||||
|
||||
BKE_blendfile_write_partial_begin(bmain_src);
|
||||
BKE_blendfile_write_partial_begin(bmain_src);
|
||||
|
||||
/* array of ID's and backup any data we modify */
|
||||
struct {
|
||||
ID *id;
|
||||
/* original values */
|
||||
short id_flag;
|
||||
short id_us;
|
||||
} *id_store_array, *id_store;
|
||||
int id_store_len = 0;
|
||||
/* array of ID's and backup any data we modify */
|
||||
struct {
|
||||
ID *id;
|
||||
/* original values */
|
||||
short id_flag;
|
||||
short id_us;
|
||||
} * id_store_array, *id_store;
|
||||
int id_store_len = 0;
|
||||
|
||||
PyObject *ret;
|
||||
PyObject *ret;
|
||||
|
||||
/* collect all id data from the set and store in 'id_store_array' */
|
||||
{
|
||||
Py_ssize_t pos, hash;
|
||||
PyObject *key;
|
||||
/* collect all id data from the set and store in 'id_store_array' */
|
||||
{
|
||||
Py_ssize_t pos, hash;
|
||||
PyObject *key;
|
||||
|
||||
id_store_array = MEM_mallocN(sizeof(*id_store_array) * PySet_Size(datablocks), __func__);
|
||||
id_store = id_store_array;
|
||||
id_store_array = MEM_mallocN(sizeof(*id_store_array) * PySet_Size(datablocks), __func__);
|
||||
id_store = id_store_array;
|
||||
|
||||
pos = hash = 0;
|
||||
while (_PySet_NextEntry(datablocks, &pos, &key, &hash)) {
|
||||
pos = hash = 0;
|
||||
while (_PySet_NextEntry(datablocks, &pos, &key, &hash)) {
|
||||
|
||||
if (!pyrna_id_FromPyObject(key, &id_store->id)) {
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"Expected an ID type, not %.200s",
|
||||
Py_TYPE(key)->tp_name);
|
||||
ret = NULL;
|
||||
goto finally;
|
||||
}
|
||||
else {
|
||||
id_store->id_flag = id_store->id->flag;
|
||||
id_store->id_us = id_store->id->us;
|
||||
if (!pyrna_id_FromPyObject(key, &id_store->id)) {
|
||||
PyErr_Format(PyExc_TypeError, "Expected an ID type, not %.200s", Py_TYPE(key)->tp_name);
|
||||
ret = NULL;
|
||||
goto finally;
|
||||
}
|
||||
else {
|
||||
id_store->id_flag = id_store->id->flag;
|
||||
id_store->id_us = id_store->id->us;
|
||||
|
||||
if (use_fake_user) {
|
||||
id_store->id->flag |= LIB_FAKEUSER;
|
||||
}
|
||||
id_store->id->us = 1;
|
||||
if (use_fake_user) {
|
||||
id_store->id->flag |= LIB_FAKEUSER;
|
||||
}
|
||||
id_store->id->us = 1;
|
||||
|
||||
BKE_blendfile_write_partial_tag_ID(id_store->id, true);
|
||||
BKE_blendfile_write_partial_tag_ID(id_store->id, true);
|
||||
|
||||
id_store_len += 1;
|
||||
id_store++;
|
||||
}
|
||||
}
|
||||
}
|
||||
id_store_len += 1;
|
||||
id_store++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* write blend */
|
||||
int retval = 0;
|
||||
ReportList reports;
|
||||
/* write blend */
|
||||
int retval = 0;
|
||||
ReportList reports;
|
||||
|
||||
BKE_reports_init(&reports, RPT_STORE);
|
||||
BKE_reports_init(&reports, RPT_STORE);
|
||||
|
||||
retval = BKE_blendfile_write_partial(bmain_src, filepath_abs, write_flags, &reports);
|
||||
retval = BKE_blendfile_write_partial(bmain_src, filepath_abs, write_flags, &reports);
|
||||
|
||||
/* cleanup state */
|
||||
BKE_blendfile_write_partial_end(bmain_src);
|
||||
|
||||
if (retval) {
|
||||
BKE_reports_print(&reports, RPT_ERROR_ALL);
|
||||
BKE_reports_clear(&reports);
|
||||
ret = Py_None;
|
||||
Py_INCREF(ret);
|
||||
}
|
||||
else {
|
||||
if (BPy_reports_to_error(&reports, PyExc_IOError, true) == 0) {
|
||||
PyErr_SetString(PyExc_IOError, "Unknown error writing library data");
|
||||
}
|
||||
ret = NULL;
|
||||
}
|
||||
/* cleanup state */
|
||||
BKE_blendfile_write_partial_end(bmain_src);
|
||||
|
||||
if (retval) {
|
||||
BKE_reports_print(&reports, RPT_ERROR_ALL);
|
||||
BKE_reports_clear(&reports);
|
||||
ret = Py_None;
|
||||
Py_INCREF(ret);
|
||||
}
|
||||
else {
|
||||
if (BPy_reports_to_error(&reports, PyExc_IOError, true) == 0) {
|
||||
PyErr_SetString(PyExc_IOError, "Unknown error writing library data");
|
||||
}
|
||||
ret = NULL;
|
||||
}
|
||||
|
||||
finally:
|
||||
|
||||
/* clear all flags for ID's added to the store (may run on error too) */
|
||||
id_store = id_store_array;
|
||||
/* clear all flags for ID's added to the store (may run on error too) */
|
||||
id_store = id_store_array;
|
||||
|
||||
for (int i = 0; i < id_store_len; id_store++, i++) {
|
||||
for (int i = 0; i < id_store_len; id_store++, i++) {
|
||||
|
||||
if (use_fake_user) {
|
||||
if ((id_store->id_flag & LIB_FAKEUSER) == 0) {
|
||||
id_store->id->flag &= ~LIB_FAKEUSER;
|
||||
}
|
||||
}
|
||||
|
||||
if (use_fake_user) {
|
||||
if ((id_store->id_flag & LIB_FAKEUSER) == 0) {
|
||||
id_store->id->flag &= ~LIB_FAKEUSER;
|
||||
}
|
||||
}
|
||||
id_store->id->us = id_store->id_us;
|
||||
|
||||
id_store->id->us = id_store->id_us;
|
||||
BKE_blendfile_write_partial_tag_ID(id_store->id, false);
|
||||
}
|
||||
|
||||
BKE_blendfile_write_partial_tag_ID(id_store->id, false);
|
||||
}
|
||||
MEM_freeN(id_store_array);
|
||||
|
||||
MEM_freeN(id_store_array);
|
||||
|
||||
return ret;
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
int BPY_library_write_module(PyObject *mod_par)
|
||||
{
|
||||
static PyMethodDef write_meth = {
|
||||
"write", (PyCFunction)bpy_lib_write,
|
||||
METH_STATIC | METH_VARARGS | METH_KEYWORDS,
|
||||
bpy_lib_write_doc,
|
||||
};
|
||||
static PyMethodDef write_meth = {
|
||||
"write",
|
||||
(PyCFunction)bpy_lib_write,
|
||||
METH_STATIC | METH_VARARGS | METH_KEYWORDS,
|
||||
bpy_lib_write_doc,
|
||||
};
|
||||
|
||||
PyModule_AddObject(mod_par, "_library_write", PyCFunction_New(&write_meth, NULL));
|
||||
PyModule_AddObject(mod_par, "_library_write", PyCFunction_New(&write_meth, NULL));
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user