[Bf-blender-cvs] [ff5d24f8bec] master: Refactor: use new api in write_iddata
Jacques Lucke
noreply at git.blender.org
Fri Jun 5 14:45:40 CEST 2020
Commit: ff5d24f8bec4b76780200196749f949c56445b7e
Author: Jacques Lucke
Date: Fri Jun 5 14:45:32 2020 +0200
Branches: master
https://developer.blender.org/rBff5d24f8bec4b76780200196749f949c56445b7e
Refactor: use new api in write_iddata
===================================================================
M source/blender/blenloader/intern/writefile.c
===================================================================
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index da350c6a480..e7bae740e4f 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -758,28 +758,27 @@ void IDP_WriteProperty(const IDProperty *prop, WriteData *wd)
IDP_WriteProperty_new_api(prop, &writer);
}
-static void write_iddata(WriteData *wd, ID *id)
+static void write_iddata(BlendWriter *writer, ID *id)
{
/* ID_WM's id->properties are considered runtime only, and never written in .blend file. */
if (id->properties && !ELEM(GS(id->name), ID_WM)) {
- IDP_WriteProperty(id->properties, wd);
+ IDP_WriteProperty_new_api(id->properties, writer);
}
if (id->override_library) {
- writestruct(wd, DATA, IDOverrideLibrary, 1, id->override_library);
+ BLO_write_struct(writer, IDOverrideLibrary, id->override_library);
- writelist(wd, DATA, IDOverrideLibraryProperty, &id->override_library->properties);
+ BLO_write_struct_list(writer, IDOverrideLibraryProperty, &id->override_library->properties);
LISTBASE_FOREACH (IDOverrideLibraryProperty *, op, &id->override_library->properties) {
- writedata(wd, DATA, strlen(op->rna_path) + 1, op->rna_path);
+ BLO_write_string(writer, op->rna_path);
- writelist(wd, DATA, IDOverrideLibraryPropertyOperation, &op->operations);
+ BLO_write_struct_list(writer, IDOverrideLibraryPropertyOperation, &op->operations);
LISTBASE_FOREACH (IDOverrideLibraryPropertyOperation *, opop, &op->operations) {
if (opop->subitem_reference_name) {
- writedata(
- wd, DATA, strlen(opop->subitem_reference_name) + 1, opop->subitem_reference_name);
+ BLO_write_string(writer, opop->subitem_reference_name);
}
if (opop->subitem_local_name) {
- writedata(wd, DATA, strlen(opop->subitem_local_name) + 1, opop->subitem_local_name);
+ BLO_write_string(writer, opop->subitem_local_name);
}
}
}
@@ -908,7 +907,7 @@ static void write_action(BlendWriter *writer, bAction *act, const void *id_addre
{
if (act->id.us > 0 || BLO_write_is_undo(writer)) {
BLO_write_id_struct(writer, bAction, id_address, &act->id);
- write_iddata(writer->wd, &act->id);
+ write_iddata(writer, &act->id);
write_fcurves(writer->wd, &act->curves);
@@ -1452,7 +1451,7 @@ static void write_particlesettings(BlendWriter *writer,
if (part->id.us > 0 || BLO_write_is_undo(writer)) {
/* write LibData */
BLO_write_id_struct(writer, ParticleSettings, id_address, &part->id);
- write_iddata(writer->wd, &part->id);
+ write_iddata(writer, &part->id);
if (part->adt) {
write_animdata(writer->wd, part->adt);
@@ -1964,7 +1963,7 @@ static void write_object(BlendWriter *writer, Object *ob, const void *id_address
/* write LibData */
BLO_write_id_struct(writer, Object, id_address, &ob->id);
- write_iddata(writer->wd, &ob->id);
+ write_iddata(writer, &ob->id);
if (ob->adt) {
write_animdata(writer->wd, ob->adt);
@@ -2032,7 +2031,7 @@ static void write_vfont(BlendWriter *writer, VFont *vf, const void *id_address)
/* write LibData */
BLO_write_id_struct(writer, VFont, id_address, &vf->id);
- write_iddata(writer->wd, &vf->id);
+ write_iddata(writer, &vf->id);
/* direct data */
if (vf->packedfile) {
@@ -2048,7 +2047,7 @@ static void write_key(BlendWriter *writer, Key *key, const void *id_address)
if (key->id.us > 0 || BLO_write_is_undo(writer)) {
/* write LibData */
BLO_write_id_struct(writer, Key, id_address, &key->id);
- write_iddata(writer->wd, &key->id);
+ write_iddata(writer, &key->id);
if (key->adt) {
write_animdata(writer->wd, key->adt);
@@ -2069,7 +2068,7 @@ static void write_camera(BlendWriter *writer, Camera *cam, const void *id_addres
if (cam->id.us > 0 || BLO_write_is_undo(writer)) {
/* write LibData */
BLO_write_id_struct(writer, Camera, id_address, &cam->id);
- write_iddata(writer->wd, &cam->id);
+ write_iddata(writer, &cam->id);
if (cam->adt) {
write_animdata(writer->wd, cam->adt);
@@ -2094,7 +2093,7 @@ static void write_mball(BlendWriter *writer, MetaBall *mb, const void *id_addres
/* write LibData */
BLO_write_id_struct(writer, MetaBall, id_address, &mb->id);
- write_iddata(writer->wd, &mb->id);
+ write_iddata(writer, &mb->id);
/* direct data */
BLO_write_pointer_array(writer, mb->totcol, mb->mat);
@@ -2118,7 +2117,7 @@ static void write_curve(BlendWriter *writer, Curve *cu, const void *id_address)
/* write LibData */
BLO_write_id_struct(writer, Curve, id_address, &cu->id);
- write_iddata(writer->wd, &cu->id);
+ write_iddata(writer, &cu->id);
/* direct data */
BLO_write_pointer_array(writer, cu->totcol, cu->mat);
@@ -2296,7 +2295,7 @@ static void write_mesh(BlendWriter *writer, Mesh *mesh, const void *id_address)
CustomData_file_write_prepare(&mesh->pdata, &players, players_buff, ARRAY_SIZE(players_buff));
BLO_write_id_struct(writer, Mesh, id_address, &mesh->id);
- write_iddata(writer->wd, &mesh->id);
+ write_iddata(writer, &mesh->id);
/* direct data */
if (mesh->adt) {
@@ -2346,7 +2345,7 @@ static void write_lattice(BlendWriter *writer, Lattice *lt, const void *id_addre
/* write LibData */
BLO_write_id_struct(writer, Lattice, id_address, <->id);
- write_iddata(writer->wd, <->id);
+ write_iddata(writer, <->id);
/* write animdata */
if (lt->adt) {
@@ -2374,7 +2373,7 @@ static void write_image(BlendWriter *writer, Image *ima, const void *id_address)
/* write LibData */
BLO_write_id_struct(writer, Image, id_address, &ima->id);
- write_iddata(writer->wd, &ima->id);
+ write_iddata(writer, &ima->id);
for (imapf = ima->packedfiles.first; imapf; imapf = imapf->next) {
BLO_write_struct(writer, ImagePackedFile, imapf);
@@ -2405,7 +2404,7 @@ static void write_texture(BlendWriter *writer, Tex *tex, const void *id_address)
if (tex->id.us > 0 || BLO_write_is_undo(writer)) {
/* write LibData */
BLO_write_id_struct(writer, Tex, id_address, &tex->id);
- write_iddata(writer->wd, &tex->id);
+ write_iddata(writer, &tex->id);
if (tex->adt) {
write_animdata(writer->wd, tex->adt);
@@ -2435,7 +2434,7 @@ static void write_material(BlendWriter *writer, Material *ma, const void *id_add
/* write LibData */
BLO_write_id_struct(writer, Material, id_address, &ma->id);
- write_iddata(writer->wd, &ma->id);
+ write_iddata(writer, &ma->id);
if (ma->adt) {
write_animdata(writer->wd, ma->adt);
@@ -2464,7 +2463,7 @@ static void write_world(BlendWriter *writer, World *wrld, const void *id_address
/* write LibData */
BLO_write_id_struct(writer, World, id_address, &wrld->id);
- write_iddata(writer->wd, &wrld->id);
+ write_iddata(writer, &wrld->id);
if (wrld->adt) {
write_animdata(writer->wd, wrld->adt);
@@ -2485,7 +2484,7 @@ static void write_light(BlendWriter *writer, Light *la, const void *id_address)
if (la->id.us > 0 || BLO_write_is_undo(writer)) {
/* write LibData */
BLO_write_id_struct(writer, Light, id_address, &la->id);
- write_iddata(writer->wd, &la->id);
+ write_iddata(writer, &la->id);
if (la->adt) {
write_animdata(writer->wd, la->adt);
@@ -2530,7 +2529,7 @@ static void write_collection(BlendWriter *writer, Collection *collection, const
/* write LibData */
BLO_write_id_struct(writer, Collection, id_address, &collection->id);
- write_iddata(writer->wd, &collection->id);
+ write_iddata(writer, &collection->id);
write_collection_nolib(writer->wd, collection);
}
@@ -2653,7 +2652,7 @@ static void write_scene(BlendWriter *writer, Scene *sce, const void *id_address)
/* write LibData */
BLO_write_id_struct(writer, Scene, id_address, &sce->id);
- write_iddata(writer->wd, &sce->id);
+ write_iddata(writer, &sce->id);
if (sce->adt) {
write_animdata(writer->wd, sce->adt);
@@ -2887,7 +2886,7 @@ static void write_gpencil(BlendWriter *writer, bGPdata *gpd, const void *id_addr
/* write gpd data block to file */
BLO_write_id_struct(writer, bGPdata, id_address, &gpd->id);
- write_iddata(writer->wd, &gpd->id);
+ write_iddata(writer, &gpd->id);
if (gpd->adt) {
write_animdata(writer->wd, gpd->adt);
@@ -3163,7 +3162,7 @@ static void write_area_map(WriteData *wd, ScrAreaMap *area_map)
static void write_windowmanager(BlendWriter *writer, wmWindowManager *wm, const void *id_address)
{
BLO_write_id_struct(writer, wmWindowManager, id_address, &wm->id);
- write_iddata(writer->wd, &wm->id);
+ write_iddata(writer, &wm->id);
write_wm_xr_data(writer->wd, &wm->xr);
LISTBASE_FOREACH (wmWindow *, win, &wm->windows) {
@@ -3198,7 +3197,7 @@ static void write_screen(BlendWriter *writer, bScreen *screen, const void *id_ad
/* write LibData */
/* in 2.50+ files, the file identifier for screens is patched, forward compatibility */
writestruct_at_address(writer->wd, ID_SCRN, bScreen, 1, id_address, screen);
- write_iddata(writer->wd, &screen->id);
+ write_iddata(writer, &screen->id);
write_previews(writer->wd, screen->preview);
@@ -3238,7 +3237,7 @@ static void write_armature(BlendWriter *writer, bArmature *arm, const void *id_a
arm->act_edbone = NULL;
BLO_write_id_struct(writer, bArmature, id_address, &arm->id);
- write_iddata(writer->wd, &arm->id);
+ write_iddata(writer, &arm->id);
if (arm->adt) {
write_animdata(writer->wd, arm->adt);
@@ -3263,7 +3262,7 @@ static void write_text(BlendWriter *writer, Text *text, const void *id_address)
/* write LibData */
BLO_write_id_struct(writer, Text, id_address, &text->id);
- write_iddata(writer->wd, &text->id);
+ write_iddata(writer, &text->id);
if (text->name) {
BLO_write_string(writer, text->name);
@@ -3286,7 +3285,7 @@ static void write_speaker(BlendWriter *writer, Speaker *spk, const void *id_addr
if (spk->id.us > 0 || BLO_write_is_undo(writer)) {
/* write
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list