blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Refactor: use new api for remaining direct data writing

This commit is contained in:
Jacques Lucke 2020-06-05 21:51:07 +02:00
parent 60b8db587f
commit fc672ce8e2
Notes: blender-bot 2023-02-14 02:22:13 +01:00 
Referenced by issue #77478, Builds following b74cc23dc4 produce errors - Linux
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenloader/intern/writefile.c
View File

@ -770,7 +770,7 @@ static void write_previews(BlendWriter *writer, const PreviewImage *prv_orig)
prv.h[1] = 0;
prv.rect[1] = NULL;
}
writestruct_at_address(writer->wd, DATA, PreviewImage, 1, prv_orig, &prv);
BLO_write_struct_at_address(writer, PreviewImage, prv_orig, &prv);
if (prv.rect[0]) {
BLO_write_uint32_array(writer, prv.w[0] * prv.h[0], prv.rect[0]);
}
@ -2191,7 +2191,7 @@ static void write_customdata(BlendWriter *writer,
CustomData_external_write(data, id, cddata_mask, count, 0);
}
writestruct_at_address(writer->wd, DATA, CustomDataLayer, data->totlayer, data->layers, layers);
BLO_write_struct_array_at_address(writer, CustomDataLayer, data->totlayer, data->layers, layers);
for (i = 0; i < data->totlayer; i++) {
CustomDataLayer *layer = &layers[i];
@ -2953,14 +2953,14 @@ static void write_soops(BlendWriter *writer, SpaceOutliner *so)
BLO_write_struct(writer, SpaceOutliner, so);
writestruct_at_address(writer->wd, DATA, TreeStore, 1, ts, &ts_flat);
writestruct_at_address(writer->wd, DATA, TreeStoreElem, elems, data_addr, data);
BLO_write_struct_at_address(writer, TreeStore, ts, &ts_flat);
BLO_write_struct_array_at_address(writer, TreeStoreElem, elems, data_addr, data);
MEM_freeN(data);
}
else {
so_flat.treestore = NULL;
writestruct_at_address(writer->wd, DATA, SpaceOutliner, 1, so, &so_flat);
BLO_write_struct_at_address(writer, SpaceOutliner, so, &so_flat);
}
}
else {