griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: code-style

Browse Source 
Other changes here planned which touch many lines, so run cleanup first.
This commit is contained in:
Campbell Barton
2016-06-28 17:35:35 +10:00
parent 72fc2b6afe
commit f181839c57
1 changed files with 1233 additions and 994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,7 +173,7 @@
#include "BKE_mesh.h"
#ifdef USE_NODE_COMPAT_CUSTOMNODES
#include "NOD_socket.h" /* for sock->default_value data */
#include "NOD_socket.h" /* for sock->default_value data */
#endif
@@ -304,7 +304,7 @@ typedef struct {
unsigned char *buf;
MemFile *compare, *current;
int tot, count, error;
/* Wrap writing, so we can use zlib or
@@ -319,21 +319,26 @@ typedef struct {
static WriteData *writedata_new(WriteWrap *ww)
{
WriteData *wd= MEM_callocN(sizeof(*wd), "writedata");
WriteData *wd = MEM_callocN(sizeof(*wd), "writedata");
wd->sdna = DNA_sdna_from_data(DNAstr, DNAlen, false);
wd->ww = ww;
wd->buf= MEM_mallocN(MYWRITE_BUFFER_SIZE, "wd->buf");
wd->buf = MEM_mallocN(MYWRITE_BUFFER_SIZE, "wd->buf");
return wd;
}
static void writedata_do_write(WriteData *wd, const void *mem, int memlen)
{
if ((wd == NULL) || wd->error || (mem == NULL) || memlen < 1) return;
if (wd->error) return;
if ((wd == NULL) || wd->error || (mem == NULL) || memlen < 1) {
return;
}
if (UNLIKELY(wd->error)) {
return;
}
/* memory based save */
if (wd->current) {
@@ -367,29 +372,31 @@ static void writedata_free(WriteData *wd)
static void mywrite(WriteData *wd, const void *adr, int len)
{
if (wd->error) return;
if (UNLIKELY(wd->error)) {
return;
}
/* flush helps compression for undo-save */
if (adr==MYWRITE_FLUSH) {
if (adr == MYWRITE_FLUSH) {
if (wd->count) {
writedata_do_write(wd, wd->buf, wd->count);
wd->count= 0;
wd->count = 0;
}
return;
}
wd->tot+= len;
wd->tot += len;
/* if we have a single big chunk, write existing data in
* buffer and write out big chunk in smaller pieces */
if (len>MYWRITE_MAX_CHUNK) {
if (len > MYWRITE_MAX_CHUNK) {
if (wd->count) {
writedata_do_write(wd, wd->buf, wd->count);
wd->count= 0;
wd->count = 0;
}
do {
int writelen= MIN2(len, MYWRITE_MAX_CHUNK);
int writelen = MIN2(len, MYWRITE_MAX_CHUNK);
writedata_do_write(wd, adr, writelen);
adr = (const char *)adr + writelen;
len -= writelen;
@@ -399,14 +406,14 @@ static void mywrite(WriteData *wd, const void *adr, int len)
}
/* if data would overflow buffer, write out the buffer */
if (len+wd->count>MYWRITE_BUFFER_SIZE-1) {
if (len + wd->count > MYWRITE_BUFFER_SIZE - 1) {
writedata_do_write(wd, wd->buf, wd->count);
wd->count= 0;
wd->count = 0;
}
/* append data at end of buffer */
memcpy(&wd->buf[wd->count], adr, len);
wd->count+= len;
wd->count += len;
}
/**
@@ -418,15 +425,17 @@ static void mywrite(WriteData *wd, const void *adr, int len)
*/
static WriteData *bgnwrite(WriteWrap *ww, MemFile *compare, MemFile *current)
{
WriteData *wd= writedata_new(ww);
WriteData *wd = writedata_new(ww);
if (wd == NULL) return NULL;
if (wd == NULL) {
return NULL;
}
wd->compare= compare;
wd->current= current;
wd->compare = compare;
wd->current = current;
/* this inits comparing */
memfile_chunk_add(compare, NULL, NULL, 0);
return wd;
}
@@ -442,10 +451,10 @@ static int endwrite(WriteData *wd)
if (wd->count) {
writedata_do_write(wd, wd->buf, wd->count);
wd->count= 0;
wd->count = 0;
}
err= wd->error;
err = wd->error;
writedata_free(wd);
return err;
@@ -460,23 +469,27 @@ static void writestruct_at_address(
BHead bh;
const short *sp;
if (adr==NULL || data==NULL || nr==0) return;
if (adr == NULL || data == NULL || nr == 0) {
return;
}
/* init BHead */
bh.code= filecode;
bh.old= adr;
bh.nr= nr;
bh.code = filecode;
bh.old = adr;
bh.nr = nr;
bh.SDNAnr= DNA_struct_find_nr(wd->sdna, structname);
if (bh.SDNAnr== -1) {
bh.SDNAnr = DNA_struct_find_nr(wd->sdna, structname);
if (bh.SDNAnr == -1) {
printf("error: can't find SDNA code <%s>\n", structname);
return;
}
sp= wd->sdna->structs[bh.SDNAnr];
sp = wd->sdna->structs[bh.SDNAnr];
bh.len= nr*wd->sdna->typelens[sp[0]];
bh.len = nr * wd->sdna->typelens[sp[0]];
if (bh.len==0) return;
if (bh.len == 0) {
return;
}
mywrite(wd, &bh, sizeof(BHead));
mywrite(wd, data, bh.len);
@@ -493,8 +506,9 @@ static void writedata(WriteData *wd, int filecode, int len, const void *adr) /*
{
BHead bh;
if (adr==NULL) return;
if (len==0) return;
if (adr == NULL || len == 0) {
return;
}
/* align to 4 (writes uninitialized bytes in some cases) */
len = (len + 3) & ~3;
@@ -514,7 +528,7 @@ static void writedata(WriteData *wd, int filecode, int len, const void *adr) /*
static void writelist(WriteData *wd, int filecode, const char *structname, const ListBase *lb)
{
const Link *link = lb->first;
while (link) {
writestruct(wd, filecode, structname, 1, link);
link = link->next;
@@ -533,11 +547,12 @@ static void IDP_WriteArray(const IDProperty *prop, void *wd)
writedata(wd, DATA, MEM_allocN_len(prop->data.pointer), prop->data.pointer);
if (prop->subtype == IDP_GROUP) {
IDProperty **array= prop->data.pointer;
IDProperty **array = prop->data.pointer;
int a;
for (a=0; a<prop->len; a++)
for (a = 0; a < prop->len; a++) {
IDP_WriteProperty(array[a], wd);
}
}
}
}
@@ -551,8 +566,9 @@ static void IDP_WriteIDPArray(const IDProperty *prop, void *wd)
writestruct(wd, DATA, "IDProperty", prop->len, array);
for (a=0; a<prop->len; a++)
for (a = 0; a < prop->len; a++) {
IDP_WriteProperty_OnlyData(&array[a], wd);
}
}
}
@@ -566,7 +582,7 @@ static void IDP_WriteGroup(const IDProperty *prop, void *wd)
{
IDProperty *loop;
for (loop=prop->data.group.first; loop; loop=loop->next) {
for (loop = prop->data.group.first; loop; loop = loop->next) {
IDP_WriteProperty(loop, wd);
}
}
@@ -629,45 +645,47 @@ static void write_previews(WriteData *wd, const PreviewImage *prv_orig)
static void write_fmodifiers(WriteData *wd, ListBase *fmodifiers)
{
FModifier *fcm;
/* Write all modifiers first (for faster reloading) */
writelist(wd, DATA, "FModifier", fmodifiers);
/* Modifiers */
for (fcm= fmodifiers->first; fcm; fcm= fcm->next) {
const FModifierTypeInfo *fmi= fmodifier_get_typeinfo(fcm);
for (fcm = fmodifiers->first; fcm; fcm = fcm->next) {
const FModifierTypeInfo *fmi = fmodifier_get_typeinfo(fcm);
/* Write the specific data */
if (fmi && fcm->data) {
/* firstly, just write the plain fmi->data struct */
writestruct(wd, DATA, fmi->structName, 1, fcm->data);
/* do any modifier specific stuff */
switch (fcm->type) {
case FMODIFIER_TYPE_GENERATOR:
{
FMod_Generator *data= (FMod_Generator *)fcm->data;
FMod_Generator *data = fcm->data;
/* write coefficients array */
if (data->coefficients)
writedata(wd, DATA, sizeof(float)*(data->arraysize), data->coefficients);
if (data->coefficients) {
writedata(wd, DATA, sizeof(float) * (data->arraysize), data->coefficients);
}
break;
}
case FMODIFIER_TYPE_ENVELOPE:
{
FMod_Envelope *data= (FMod_Envelope *)fcm->data;
FMod_Envelope *data = fcm->data;
/* write envelope data */
if (data->data)
if (data->data) {
writestruct(wd, DATA, "FCM_EnvelopeData", data->totvert, data->data);
}
break;
}
case FMODIFIER_TYPE_PYTHON:
{
FMod_Python *data = (FMod_Python *)fcm->data;
FMod_Python *data = fcm->data;
/* Write ID Properties -- and copy this comment EXACTLY for easy finding
* of library blocks that implement this.*/
IDP_WriteProperty(data->prop, wd);
@@ -682,37 +700,41 @@ static void write_fmodifiers(WriteData *wd, ListBase *fmodifiers)
static void write_fcurves(WriteData *wd, ListBase *fcurves)
{
FCurve *fcu;
writelist(wd, DATA, "FCurve", fcurves);
for (fcu=fcurves->first; fcu; fcu=fcu->next) {
for (fcu = fcurves->first; fcu; fcu = fcu->next) {
/* curve data */
if (fcu->bezt)
if (fcu->bezt) {
writestruct(wd, DATA, "BezTriple", fcu->totvert, fcu->bezt);
if (fcu->fpt)
}
if (fcu->fpt) {
writestruct(wd, DATA, "FPoint", fcu->totvert, fcu->fpt);
if (fcu->rna_path)
writedata(wd, DATA, strlen(fcu->rna_path)+1, fcu->rna_path);
}
if (fcu->rna_path) {
writedata(wd, DATA, strlen(fcu->rna_path) + 1, fcu->rna_path);
}
/* driver data */
if (fcu->driver) {
ChannelDriver *driver= fcu->driver;
ChannelDriver *driver = fcu->driver;
DriverVar *dvar;
writestruct(wd, DATA, "ChannelDriver", 1, driver);
/* variables */
writelist(wd, DATA, "DriverVar", &driver->variables);
for (dvar= driver->variables.first; dvar; dvar= dvar->next) {
for (dvar = driver->variables.first; dvar; dvar = dvar->next) {
DRIVER_TARGETS_USED_LOOPER(dvar)
{
if (dtar->rna_path)
writedata(wd, DATA, strlen(dtar->rna_path)+1, dtar->rna_path);
if (dtar->rna_path) {
writedata(wd, DATA, strlen(dtar->rna_path) + 1, dtar->rna_path);
}
}
DRIVER_TARGETS_LOOPER_END
}
}
/* write F-Modifiers */
write_fmodifiers(wd, &fcu->modifiers);
}
@@ -720,27 +742,27 @@ static void write_fcurves(WriteData *wd, ListBase *fcurves)
static void write_actions(WriteData *wd, ListBase *idbase)
{
bAction *act;
bAction *act;
bActionGroup *grp;
TimeMarker *marker;
for (act=idbase->first; act; act= act->id.next) {
if (act->id.us>0 || wd->current) {
for (act = idbase->first; act; act = act->id.next) {
if (act->id.us > 0 || wd->current) {
writestruct(wd, ID_AC, "bAction", 1, act);
write_iddata(wd, &act->id);
write_fcurves(wd, &act->curves);
for (grp=act->groups.first; grp; grp=grp->next) {
for (grp = act->groups.first; grp; grp = grp->next) {
writestruct(wd, DATA, "bActionGroup", 1, grp);
}
for (marker=act->markers.first; marker; marker=marker->next) {
for (marker = act->markers.first; marker; marker = marker->next) {
writestruct(wd, DATA, "TimeMarker", 1, marker);
}
}
}
/* flush helps the compression for undo-save */
mywrite(wd, MYWRITE_FLUSH, 0);
}
@@ -749,18 +771,19 @@ static void write_keyingsets(WriteData *wd, ListBase *list)
{
KeyingSet *ks;
KS_Path *ksp;
for (ks= list->first; ks; ks= ks->next) {
for (ks = list->first; ks; ks = ks->next) {
/* KeyingSet */
writestruct(wd, DATA, "KeyingSet", 1, ks);
/* Paths */
for (ksp= ks->paths.first; ksp; ksp= ksp->next) {
for (ksp = ks->paths.first; ksp; ksp = ksp->next) {
/* Path */
writestruct(wd, DATA, "KS_Path", 1, ksp);
if (ksp->rna_path)
writedata(wd, DATA, strlen(ksp->rna_path)+1, ksp->rna_path);
if (ksp->rna_path) {
writedata(wd, DATA, strlen(ksp->rna_path) + 1, ksp->rna_path);
}
}
}
}
@@ -768,13 +791,13 @@ static void write_keyingsets(WriteData *wd, ListBase *list)
static void write_nlastrips(WriteData *wd, ListBase *strips)
{
NlaStrip *strip;
writelist(wd, DATA, "NlaStrip", strips);
for (strip= strips->first; strip; strip= strip->next) {
for (strip = strips->first; strip; strip = strip->next) {
/* write the strip's F-Curves and modifiers */
write_fcurves(wd, &strip->fcurves);
write_fmodifiers(wd, &strip->modifiers);
/* write the strip's children */
write_nlastrips(wd, &strip->strips);
}
@@ -783,12 +806,12 @@ static void write_nlastrips(WriteData *wd, ListBase *strips)
static void write_nladata(WriteData *wd, ListBase *nlabase)
{
NlaTrack *nlt;
/* write all the tracks */
for (nlt= nlabase->first; nlt; nlt= nlt->next) {
for (nlt = nlabase->first; nlt; nlt = nlt->next) {
/* write the track first */
writestruct(wd, DATA, "NlaTrack", 1, nlt);
/* write the track's strips */
write_nlastrips(wd, &nlt->strips);
}
@@ -797,33 +820,32 @@ static void write_nladata(WriteData *wd, ListBase *nlabase)
static void write_animdata(WriteData *wd, AnimData *adt)
{
AnimOverride *aor;
/* firstly, just write the AnimData block */
writestruct(wd, DATA, "AnimData", 1, adt);
/* write drivers */
write_fcurves(wd, &adt->drivers);
/* write overrides */
// FIXME: are these needed?
for (aor= adt->overrides.first; aor; aor= aor->next) {
for (aor = adt->overrides.first; aor; aor = aor->next) {
/* overrides consist of base data + rna_path */
writestruct(wd, DATA, "AnimOverride", 1, aor);
writedata(wd, DATA, strlen(aor->rna_path)+1, aor->rna_path);
writedata(wd, DATA, strlen(aor->rna_path) + 1, aor->rna_path);
}
// TODO write the remaps (if they are needed)
/* write NLA data */
write_nladata(wd, &adt->nla_tracks);
}
static void write_curvemapping_curves(WriteData *wd, CurveMapping *cumap)
{
int a;
for (a = 0; a < CM_TOT; a++)
for (int a = 0; a < CM_TOT; a++) {
writestruct(wd, DATA, "CurveMapPoint", cumap->cm[a].totpoint, cumap->cm[a].curve);
}
}
static void write_curvemapping(WriteData *wd, CurveMapping *cumap)
@@ -838,14 +860,14 @@ static void write_node_socket(WriteData *wd, bNodeTree *UNUSED(ntree), bNode *no
#ifdef USE_NODE_COMPAT_CUSTOMNODES
/* forward compatibility code, so older blenders still open */
sock->stack_type = 1;
if (node->type == NODE_GROUP) {
bNodeTree *ngroup = (bNodeTree *)node->id;
if (ngroup) {
/* for node groups: look up the deprecated groupsock pointer */
sock->groupsock = ntreeFindSocketInterface(ngroup, sock->in_out, sock->identifier);
BLI_assert(sock->groupsock != NULL);
/* node group sockets now use the generic identifier string to verify group nodes,
* old blender uses the own_index.
*/
@@ -857,18 +879,20 @@ static void write_node_socket(WriteData *wd, bNodeTree *UNUSED(ntree), bNode *no
/* actual socket writing */
writestruct(wd, DATA, "bNodeSocket", 1, sock);
if (sock->prop)
if (sock->prop) {
IDP_WriteProperty(sock->prop, wd);
if (sock->default_value)
}
if (sock->default_value) {
writedata(wd, DATA, MEM_allocN_len(sock->default_value), sock->default_value);
}
}
static void write_node_socket_interface(WriteData *wd, bNodeTree *UNUSED(ntree), bNodeSocket *sock)
{
#ifdef USE_NODE_COMPAT_CUSTOMNODES
/* forward compatibility code, so older blenders still open */
sock->stack_type = 1;
/* Reconstruct the deprecated default_value structs in socket interface DNA. */
if (sock->default_value == NULL && sock->typeinfo) {
node_socket_init_default_value(sock);
@@ -878,11 +902,13 @@ static void write_node_socket_interface(WriteData *wd, bNodeTree *UNUSED(ntree),
/* actual socket writing */
writestruct(wd, DATA, "bNodeSocket", 1, sock);
if (sock->prop)
if (sock->prop) {
IDP_WriteProperty(sock->prop, wd);
if (sock->default_value)
}
if (sock->default_value) {
writedata(wd, DATA, MEM_allocN_len(sock->default_value), sock->default_value);
}
}
/* this is only direct data, tree itself should have been written */
static void write_nodetree(WriteData *wd, bNodeTree *ntree)
@@ -890,64 +916,91 @@ static void write_nodetree(WriteData *wd, bNodeTree *ntree)
bNode *node;
bNodeSocket *sock;
bNodeLink *link;
/* for link_list() speed, we write per list */
if (ntree->adt) write_animdata(wd, ntree->adt);
if (ntree->adt) {
write_animdata(wd, ntree->adt);
}
for (node = ntree->nodes.first; node; node = node->next) {
writestruct(wd, DATA, "bNode", 1, node);
if (node->prop)
if (node->prop) {
IDP_WriteProperty(node->prop, wd);
}
for (sock= node->inputs.first; sock; sock= sock->next)
for (sock = node->inputs.first; sock; sock = sock->next) {
write_node_socket(wd, ntree, node, sock);
for (sock= node->outputs.first; sock; sock= sock->next)
}
for (sock = node->outputs.first; sock; sock = sock->next) {
write_node_socket(wd, ntree, node, sock);
for (link = node->internal_links.first; link; link = link->next)
}
for (link = node->internal_links.first; link; link = link->next) {
writestruct(wd, DATA, "bNodeLink", 1, link);
}
if (node->storage) {
/* could be handlerized at some point, now only 1 exception still */
if (ntree->type==NTREE_SHADER && (node->type==SH_NODE_CURVE_VEC || node->type==SH_NODE_CURVE_RGB))
if ((ntree->type == NTREE_SHADER) &&
ELEM(node->type, SH_NODE_CURVE_VEC, SH_NODE_CURVE_RGB))
{
write_curvemapping(wd, node->storage);
else if (ntree->type==NTREE_SHADER && node->type==SH_NODE_SCRIPT) {
}
else if (ntree->type == NTREE_SHADER &&
(node->type == SH_NODE_SCRIPT))
{
NodeShaderScript *nss = (NodeShaderScript *)node->storage;
if (nss->bytecode)
writedata(wd, DATA, strlen(nss->bytecode)+1, nss->bytecode);
if (nss->bytecode) {
writedata(wd, DATA, strlen(nss->bytecode) + 1, nss->bytecode);
}
writestruct(wd, DATA, node->typeinfo->storagename, 1, node->storage);
}
else if (ntree->type==NTREE_COMPOSIT && ELEM(node->type, CMP_NODE_TIME, CMP_NODE_CURVE_VEC, CMP_NODE_CURVE_RGB, CMP_NODE_HUECORRECT))
else if ((ntree->type == NTREE_COMPOSIT) &&
ELEM(node->type, CMP_NODE_TIME, CMP_NODE_CURVE_VEC, CMP_NODE_CURVE_RGB, CMP_NODE_HUECORRECT))
{
write_curvemapping(wd, node->storage);
else if (ntree->type==NTREE_TEXTURE && (node->type==TEX_NODE_CURVE_RGB || node->type==TEX_NODE_CURVE_TIME) )
}
else if ((ntree->type == NTREE_TEXTURE) &&
(node->type == TEX_NODE_CURVE_RGB || node->type == TEX_NODE_CURVE_TIME))
{
write_curvemapping(wd, node->storage);
else if (ntree->type==NTREE_COMPOSIT && node->type==CMP_NODE_MOVIEDISTORTION) {
}
else if ((ntree->type == NTREE_COMPOSIT) &&
(node->type == CMP_NODE_MOVIEDISTORTION))
{
/* pass */
}
else
else {
writestruct(wd, DATA, node->typeinfo->storagename, 1, node->storage);
}
}
if (node->type==CMP_NODE_OUTPUT_FILE) {
if (node->type == CMP_NODE_OUTPUT_FILE) {
/* inputs have own storage data */
for (sock = node->inputs.first; sock; sock = sock->next)
for (sock = node->inputs.first; sock; sock = sock->next) {
writestruct(wd, DATA, "NodeImageMultiFileSocket", 1, sock->storage);
}
}
if (node->type==CMP_NODE_IMAGE) {
if (node->type == CMP_NODE_IMAGE) {
/* write extra socket info */
for (sock = node->outputs.first; sock; sock = sock->next)
for (sock = node->outputs.first; sock; sock = sock->next) {
writestruct(wd, DATA, "NodeImageLayer", 1, sock->storage);
}
}
}
for (link= ntree->links.first; link; link= link->next)
for (link = ntree->links.first; link; link = link->next) {
writestruct(wd, DATA, "bNodeLink", 1, link);
for (sock = ntree->inputs.first; sock; sock = sock->next)
}
for (sock = ntree->inputs.first; sock; sock = sock->next) {
write_node_socket_interface(wd, ntree, sock);
for (sock = ntree->outputs.first; sock; sock = sock->next)
}
for (sock = ntree->outputs.first; sock; sock = sock->next) {
write_node_socket_interface(wd, ntree, sock);
}
}
/**
@@ -1002,9 +1055,11 @@ static void write_renderinfo(WriteData *wd, Main *mainvar)
/* XXX in future, handle multiple windows with multiple screens? */
current_screen_compat(mainvar, &curscreen, false);
if (curscreen) curscene = curscreen->scene;
for (sce= mainvar->scene.first; sce; sce= sce->id.next) {
if (curscreen) {
curscene = curscreen->scene;
}
for (sce = mainvar->scene.first; sce; sce = sce->id.next) {
if (sce->id.lib == NULL && (sce == curscene || (sce->r.scemode & R_BG_RENDER))) {
data.sfra = sce->r.sfra;
data.efra = sce->r.efra;
@@ -1020,8 +1075,9 @@ static void write_renderinfo(WriteData *wd, Main *mainvar)
static void write_keymapitem(WriteData *wd, wmKeyMapItem *kmi)
{
writestruct(wd, DATA, "wmKeyMapItem", 1, kmi);
if (kmi->properties)
if (kmi->properties) {
IDP_WriteProperty(kmi->properties, wd);
}
}
static void write_userdef(WriteData *wd)
@@ -1033,28 +1089,32 @@ static void write_userdef(WriteData *wd)
bAddon *bext;
bPathCompare *path_cmp;
uiStyle *style;
writestruct(wd, USER, "UserDef", 1, &U);
for (btheme= U.themes.first; btheme; btheme=btheme->next)
for (btheme = U.themes.first; btheme; btheme = btheme->next) {
writestruct(wd, DATA, "bTheme", 1, btheme);
for (keymap= U.user_keymaps.first; keymap; keymap=keymap->next) {
writestruct(wd, DATA, "wmKeyMap", 1, keymap);
for (kmdi=keymap->diff_items.first; kmdi; kmdi=kmdi->next) {
writestruct(wd, DATA, "wmKeyMapDiffItem", 1, kmdi);
if (kmdi->remove_item)
write_keymapitem(wd, kmdi->remove_item);
if (kmdi->add_item)
write_keymapitem(wd, kmdi->add_item);
}
for (kmi=keymap->items.first; kmi; kmi=kmi->next)
write_keymapitem(wd, kmi);
}
for (bext= U.addons.first; bext; bext=bext->next) {
for (keymap = U.user_keymaps.first; keymap; keymap = keymap->next) {
writestruct(wd, DATA, "wmKeyMap", 1, keymap);
for (kmdi = keymap->diff_items.first; kmdi; kmdi = kmdi->next) {
writestruct(wd, DATA, "wmKeyMapDiffItem", 1, kmdi);
if (kmdi->remove_item) {
write_keymapitem(wd, kmdi->remove_item);
}
if (kmdi->add_item) {
write_keymapitem(wd, kmdi->add_item);
}
}
for (kmi = keymap->items.first; kmi; kmi = kmi->next) {
write_keymapitem(wd, kmi);
}
}
for (bext = U.addons.first; bext; bext = bext->next) {
writestruct(wd, DATA, "bAddon", 1, bext);
if (bext->prop) {
IDP_WriteProperty(bext->prop, wd);
@@ -1064,8 +1124,8 @@ static void write_userdef(WriteData *wd)
for (path_cmp = U.autoexec_paths.first; path_cmp; path_cmp = path_cmp->next) {
writestruct(wd, DATA, "bPathCompare", 1, path_cmp);
}
for (style= U.uistyles.first; style; style= style->next) {
for (style = U.uistyles.first; style; style = style->next) {
writestruct(wd, DATA, "uiStyle", 1, style);
}
}
@@ -1073,11 +1133,10 @@ static void write_userdef(WriteData *wd)
static void write_boid_state(WriteData *wd, BoidState *state)
{
BoidRule *rule = state->rules.first;
//BoidCondition *cond = state->conditions.first;
writestruct(wd, DATA, "BoidState", 1, state);
for (; rule; rule=rule->next) {
for (; rule; rule = rule->next) {
switch (rule->type) {
case eBoidRuleType_Goal:
case eBoidRuleType_Avoid:
@@ -1100,8 +1159,12 @@ static void write_boid_state(WriteData *wd, BoidState *state)
break;
}
}
//for (; cond; cond=cond->next)
// writestruct(wd, DATA, "BoidCondition", 1, cond);
#if 0
BoidCondition *cond = state->conditions.first;
for (; cond; cond = cond->next) {
writestruct(wd, DATA, "BoidCondition", 1, cond);
}
#endif
}
/* update this also to readfile.c */
@@ -1124,29 +1187,32 @@ static void write_pointcaches(WriteData *wd, ListBase *ptcaches)
PointCache *cache = ptcaches->first;
int i;
for (; cache; cache=cache->next) {
for (; cache; cache = cache->next) {
writestruct(wd, DATA, "PointCache", 1, cache);
if ((cache->flag & PTCACHE_DISK_CACHE)==0) {
if ((cache->flag & PTCACHE_DISK_CACHE) == 0) {
PTCacheMem *pm = cache->mem_cache.first;
for (; pm; pm=pm->next) {
for (; pm; pm = pm->next) {
PTCacheExtra *extra = pm->extradata.first;
writestruct(wd, DATA, "PTCacheMem", 1, pm);
for (i=0; i<BPHYS_TOT_DATA; i++) {
if (pm->data[i] && pm->data_types & (1<<i)) {
if (ptcache_data_struct[i][0] == '\0')
for (i = 0; i < BPHYS_TOT_DATA; i++) {
if (pm->data[i] && pm->data_types & (1 << i)) {
if (ptcache_data_struct[i][0] == '\0') {
writedata(wd, DATA, MEM_allocN_len(pm->data[i]), pm->data[i]);
else
}
else {
writestruct(wd, DATA, ptcache_data_struct[i], pm->totpoint, pm->data[i]);
}
}
}
for (; extra; extra=extra->next) {
if (ptcache_extra_struct[extra->type][0] == '\0')
for (; extra; extra = extra->next) {
if (ptcache_extra_struct[extra->type][0] == '\0') {
continue;
}
writestruct(wd, DATA, "PTCacheExtra", 1, extra);
writestruct(wd, DATA, ptcache_extra_struct[extra->type], extra->totdata, extra->data);
}
@@ -1161,31 +1227,35 @@ static void write_particlesettings(WriteData *wd, ListBase *idbase)
GroupObject *go;
int a;
part= idbase->first;
part = idbase->first;
while (part) {
if (part->id.us>0 || wd->current) {
if (part->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_PA, "ParticleSettings", 1, part);
write_iddata(wd, &part->id);
if (part->adt) write_animdata(wd, part->adt);
if (part->adt) {
write_animdata(wd, part->adt);
}
writestruct(wd, DATA, "PartDeflect", 1, part->pd);
writestruct(wd, DATA, "PartDeflect", 1, part->pd2);
writestruct(wd, DATA, "EffectorWeights", 1, part->effector_weights);
if (part->clumpcurve)
if (part->clumpcurve) {
write_curvemapping(wd, part->clumpcurve);
if (part->roughcurve)
}
if (part->roughcurve) {
write_curvemapping(wd, part->roughcurve);
}
dw = part->dupliweights.first;
for (; dw; dw=dw->next) {
for (; dw; dw = dw->next) {
/* update indices */
dw->index = 0;
if (part->dup_group) { /* can be NULL if lining fails or set to None */
go = part->dup_group->gobject.first;
while (go && go->ob != dw->ob) {
go=go->next;
go = go->next;
dw->index++;
}
}
@@ -1197,27 +1267,30 @@ static void write_particlesettings(WriteData *wd, ListBase *idbase)
writestruct(wd, DATA, "BoidSettings", 1, part->boids);
for (; state; state=state->next)
for (; state; state = state->next) {
write_boid_state(wd, state);
}
}
if (part->fluid && part->phystype == PART_PHYS_FLUID) {
writestruct(wd, DATA, "SPHFluidSettings", 1, part->fluid);
writestruct(wd, DATA, "SPHFluidSettings", 1, part->fluid);
}
for (a=0; a<MAX_MTEX; a++) {
if (part->mtex[a]) writestruct(wd, DATA, "MTex", 1, part->mtex[a]);
for (a = 0; a < MAX_MTEX; a++) {
if (part->mtex[a]) {
writestruct(wd, DATA, "MTex", 1, part->mtex[a]);
}
}
}
part= part->id.next;
part = part->id.next;
}
}
static void write_particlesystems(WriteData *wd, ListBase *particles)
{
ParticleSystem *psys= particles->first;
ParticleSystem *psys = particles->first;
ParticleTarget *pt;
int a;
for (; psys; psys=psys->next) {
for (; psys; psys = psys->next) {
writestruct(wd, DATA, "ParticleSystem", 1, psys);
if (psys->particles) {
@@ -1226,21 +1299,32 @@ static void write_particlesystems(WriteData *wd, ListBase *particles)
if (psys->particles->hair) {
ParticleData *pa = psys->particles;
for (a=0; a<psys->totpart; a++, pa++)
for (a = 0; a < psys->totpart; a++, pa++) {
writestruct(wd, DATA, "HairKey", pa->totkey, pa->hair);
}
}
if (psys->particles->boid && psys->part->phystype == PART_PHYS_BOIDS)
if (psys->particles->boid &&
(psys->part->phystype == PART_PHYS_BOIDS))
{
writestruct(wd, DATA, "BoidParticle", psys->totpart, psys->particles->boid);
}
if (psys->part->fluid && psys->part->phystype == PART_PHYS_FLUID && (psys->part->fluid->flag & SPH_VISCOELASTIC_SPRINGS))
if (psys->part->fluid &&
(psys->part->phystype == PART_PHYS_FLUID) &&
(psys->part->fluid->flag & SPH_VISCOELASTIC_SPRINGS))
{
writestruct(wd, DATA, "ParticleSpring", psys->tot_fluidsprings, psys->fluid_springs);
}
}
pt = psys->targets.first;
for (; pt; pt=pt->next)
for (; pt; pt = pt->next) {
writestruct(wd, DATA, "ParticleTarget", 1, pt);
}
if (psys->child) writestruct(wd, DATA, "ChildParticle", psys->totchild, psys->child);
if (psys->child) {
writestruct(wd, DATA, "ChildParticle", psys->totchild, psys->child);
}
if (psys->clmd) {
writestruct(wd, DATA, "ClothModifierData", 1, psys->clmd);
@@ -1256,14 +1340,15 @@ static void write_properties(WriteData *wd, ListBase *lb)
{
bProperty *prop;
prop= lb->first;
prop = lb->first;
while (prop) {
writestruct(wd, DATA, "bProperty", 1, prop);
if (prop->poin && prop->poin != &prop->data)
if (prop->poin && prop->poin != &prop->data) {
writedata(wd, DATA, MEM_allocN_len(prop->poin), prop->poin);
}
prop= prop->next;
prop = prop->next;
}
}
@@ -1271,57 +1356,57 @@ static void write_sensors(WriteData *wd, ListBase *lb)
{
bSensor *sens;
sens= lb->first;
sens = lb->first;
while (sens) {
writestruct(wd, DATA, "bSensor", 1, sens);
writedata(wd, DATA, sizeof(void *)*sens->totlinks, sens->links);
writedata(wd, DATA, sizeof(void *) * sens->totlinks, sens->links);
switch (sens->type) {
case SENS_NEAR:
writestruct(wd, DATA, "bNearSensor", 1, sens->data);
break;
case SENS_MOUSE:
writestruct(wd, DATA, "bMouseSensor", 1, sens->data);
break;
case SENS_KEYBOARD:
writestruct(wd, DATA, "bKeyboardSensor", 1, sens->data);
break;
case SENS_PROPERTY:
writestruct(wd, DATA, "bPropertySensor", 1, sens->data);
break;
case SENS_ARMATURE:
writestruct(wd, DATA, "bArmatureSensor", 1, sens->data);
break;
case SENS_ACTUATOR:
writestruct(wd, DATA, "bActuatorSensor", 1, sens->data);
break;
case SENS_DELAY:
writestruct(wd, DATA, "bDelaySensor", 1, sens->data);
break;
case SENS_COLLISION:
writestruct(wd, DATA, "bCollisionSensor", 1, sens->data);
break;
case SENS_RADAR:
writestruct(wd, DATA, "bRadarSensor", 1, sens->data);
break;
case SENS_RANDOM:
writestruct(wd, DATA, "bRandomSensor", 1, sens->data);
break;
case SENS_RAY:
writestruct(wd, DATA, "bRaySensor", 1, sens->data);
break;
case SENS_MESSAGE:
writestruct(wd, DATA, "bMessageSensor", 1, sens->data);
break;
case SENS_JOYSTICK:
writestruct(wd, DATA, "bJoystickSensor", 1, sens->data);
break;
default:
; /* error: don't know how to write this file */
case SENS_NEAR:
writestruct(wd, DATA, "bNearSensor", 1, sens->data);
break;
case SENS_MOUSE:
writestruct(wd, DATA, "bMouseSensor", 1, sens->data);
break;
case SENS_KEYBOARD:
writestruct(wd, DATA, "bKeyboardSensor", 1, sens->data);
break;
case SENS_PROPERTY:
writestruct(wd, DATA, "bPropertySensor", 1, sens->data);
break;
case SENS_ARMATURE:
writestruct(wd, DATA, "bArmatureSensor", 1, sens->data);
break;
case SENS_ACTUATOR:
writestruct(wd, DATA, "bActuatorSensor", 1, sens->data);
break;
case SENS_DELAY:
writestruct(wd, DATA, "bDelaySensor", 1, sens->data);
break;
case SENS_COLLISION:
writestruct(wd, DATA, "bCollisionSensor", 1, sens->data);
break;
case SENS_RADAR:
writestruct(wd, DATA, "bRadarSensor", 1, sens->data);
break;
case SENS_RANDOM:
writestruct(wd, DATA, "bRandomSensor", 1, sens->data);
break;
case SENS_RAY:
writestruct(wd, DATA, "bRaySensor", 1, sens->data);
break;
case SENS_MESSAGE:
writestruct(wd, DATA, "bMessageSensor", 1, sens->data);
break;
case SENS_JOYSTICK:
writestruct(wd, DATA, "bJoystickSensor", 1, sens->data);
break;
default:
; /* error: don't know how to write this file */
}
sens= sens->next;
sens = sens->next;
}
}
@@ -1329,24 +1414,24 @@ static void write_controllers(WriteData *wd, ListBase *lb)
{
bController *cont;
cont= lb->first;
cont = lb->first;
while (cont) {
writestruct(wd, DATA, "bController", 1, cont);
writedata(wd, DATA, sizeof(void *)*cont->totlinks, cont->links);
writedata(wd, DATA, sizeof(void *) * cont->totlinks, cont->links);
switch (cont->type) {
case CONT_EXPRESSION:
writestruct(wd, DATA, "bExpressionCont", 1, cont->data);
break;
case CONT_PYTHON:
writestruct(wd, DATA, "bPythonCont", 1, cont->data);
break;
default:
; /* error: don't know how to write this file */
case CONT_EXPRESSION:
writestruct(wd, DATA, "bExpressionCont", 1, cont->data);
break;
case CONT_PYTHON:
writestruct(wd, DATA, "bPythonCont", 1, cont->data);
break;
default:
; /* error: don't know how to write this file */
}
cont= cont->next;
cont = cont->next;
}
}
@@ -1354,86 +1439,87 @@ static void write_actuators(WriteData *wd, ListBase *lb)
{
bActuator *act;
act= lb->first;
act = lb->first;
while (act) {
writestruct(wd, DATA, "bActuator", 1, act);
switch (act->type) {
case ACT_ACTION:
case ACT_SHAPEACTION:
writestruct(wd, DATA, "bActionActuator", 1, act->data);
break;
case ACT_SOUND:
writestruct(wd, DATA, "bSoundActuator", 1, act->data);
break;
case ACT_OBJECT:
writestruct(wd, DATA, "bObjectActuator", 1, act->data);
break;
case ACT_PROPERTY:
writestruct(wd, DATA, "bPropertyActuator", 1, act->data);
break;
case ACT_CAMERA:
writestruct(wd, DATA, "bCameraActuator", 1, act->data);
break;
case ACT_CONSTRAINT:
writestruct(wd, DATA, "bConstraintActuator", 1, act->data);
break;
case ACT_EDIT_OBJECT:
writestruct(wd, DATA, "bEditObjectActuator", 1, act->data);
break;
case ACT_SCENE:
writestruct(wd, DATA, "bSceneActuator", 1, act->data);
break;
case ACT_GROUP:
writestruct(wd, DATA, "bGroupActuator", 1, act->data);
break;
case ACT_RANDOM:
writestruct(wd, DATA, "bRandomActuator", 1, act->data);
break;
case ACT_MESSAGE:
writestruct(wd, DATA, "bMessageActuator", 1, act->data);
break;
case ACT_GAME:
writestruct(wd, DATA, "bGameActuator", 1, act->data);
break;
case ACT_VISIBILITY:
writestruct(wd, DATA, "bVisibilityActuator", 1, act->data);
break;
case ACT_2DFILTER:
writestruct(wd, DATA, "bTwoDFilterActuator", 1, act->data);
break;
case ACT_PARENT:
writestruct(wd, DATA, "bParentActuator", 1, act->data);
break;
case ACT_STATE:
writestruct(wd, DATA, "bStateActuator", 1, act->data);
break;
case ACT_ARMATURE:
writestruct(wd, DATA, "bArmatureActuator", 1, act->data);
break;
case ACT_STEERING:
writestruct(wd, DATA, "bSteeringActuator", 1, act->data);
break;
case ACT_MOUSE:
writestruct(wd, DATA, "bMouseActuator", 1, act->data);
break;
default:
; /* error: don't know how to write this file */
case ACT_ACTION:
case ACT_SHAPEACTION:
writestruct(wd, DATA, "bActionActuator", 1, act->data);
break;
case ACT_SOUND:
writestruct(wd, DATA, "bSoundActuator", 1, act->data);
break;
case ACT_OBJECT:
writestruct(wd, DATA, "bObjectActuator", 1, act->data);
break;
case ACT_PROPERTY:
writestruct(wd, DATA, "bPropertyActuator", 1, act->data);
break;
case ACT_CAMERA:
writestruct(wd, DATA, "bCameraActuator", 1, act->data);
break;
case ACT_CONSTRAINT:
writestruct(wd, DATA, "bConstraintActuator", 1, act->data);
break;
case ACT_EDIT_OBJECT:
writestruct(wd, DATA, "bEditObjectActuator", 1, act->data);
break;
case ACT_SCENE:
writestruct(wd, DATA, "bSceneActuator", 1, act->data);
break;
case ACT_GROUP:
writestruct(wd, DATA, "bGroupActuator", 1, act->data);
break;
case ACT_RANDOM:
writestruct(wd, DATA, "bRandomActuator", 1, act->data);
break;
case ACT_MESSAGE:
writestruct(wd, DATA, "bMessageActuator", 1, act->data);
break;
case ACT_GAME:
writestruct(wd, DATA, "bGameActuator", 1, act->data);
break;
case ACT_VISIBILITY:
writestruct(wd, DATA, "bVisibilityActuator", 1, act->data);
break;
case ACT_2DFILTER:
writestruct(wd, DATA, "bTwoDFilterActuator", 1, act->data);
break;
case ACT_PARENT:
writestruct(wd, DATA, "bParentActuator", 1, act->data);
break;
case ACT_STATE:
writestruct(wd, DATA, "bStateActuator", 1, act->data);
break;
case ACT_ARMATURE:
writestruct(wd, DATA, "bArmatureActuator", 1, act->data);
break;
case ACT_STEERING:
writestruct(wd, DATA, "bSteeringActuator", 1, act->data);
break;
case ACT_MOUSE:
writestruct(wd, DATA, "bMouseActuator", 1, act->data);
break;
default:
; /* error: don't know how to write this file */
}
act= act->next;
act = act->next;
}
}
static void write_motionpath(WriteData *wd, bMotionPath *mpath)
{
/* sanity checks */
if (mpath == NULL)
if (mpath == NULL) {
return;
}
/* firstly, just write the motionpath struct */
writestruct(wd, DATA, "bMotionPath", 1, mpath);
/* now write the array of data */
writestruct(wd, DATA, "bMotionPathVert", mpath->length, mpath->points);
}
@@ -1442,43 +1528,44 @@ static void write_constraints(WriteData *wd, ListBase *conlist)
{
bConstraint *con;
for (con=conlist->first; con; con=con->next) {
const bConstraintTypeInfo *cti= BKE_constraint_typeinfo_get(con);
for (con = conlist->first; con; con = con->next) {
const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(con);
/* Write the specific data */
if (cti && con->data) {
/* firstly, just write the plain con->data struct */
writestruct(wd, DATA, cti->structName, 1, con->data);
/* do any constraint specific stuff */
switch (con->type) {
case CONSTRAINT_TYPE_PYTHON:
{
bPythonConstraint *data = (bPythonConstraint *)con->data;
bPythonConstraint *data = con->data;
bConstraintTarget *ct;
/* write targets */
for (ct= data->targets.first; ct; ct= ct->next)
for (ct = data->targets.first; ct; ct = ct->next) {
writestruct(wd, DATA, "bConstraintTarget", 1, ct);
}
/* Write ID Properties -- and copy this comment EXACTLY for easy finding
* of library blocks that implement this.*/
IDP_WriteProperty(data->prop, wd);
break;
}
case CONSTRAINT_TYPE_SPLINEIK:
case CONSTRAINT_TYPE_SPLINEIK:
{
bSplineIKConstraint *data = (bSplineIKConstraint *)con->data;
bSplineIKConstraint *data = con->data;
/* write points array */
writedata(wd, DATA, sizeof(float)*(data->numpoints), data->points);
writedata(wd, DATA, sizeof(float) * (data->numpoints), data->points);
break;
}
}
}
/* Write the constraint */
writestruct(wd, DATA, "bConstraint", 1, con);
}
@@ -1490,36 +1577,43 @@ static void write_pose(WriteData *wd, bPose *pose)
bActionGroup *grp;
/* Write each channel */
if (!pose)
if (pose == NULL) {
return;
}
/* Write channels */
for (chan=pose->chanbase.first; chan; chan=chan->next) {
for (chan = pose->chanbase.first; chan; chan = chan->next) {
/* Write ID Properties -- and copy this comment EXACTLY for easy finding
* of library blocks that implement this.*/
if (chan->prop)
if (chan->prop) {
IDP_WriteProperty(chan->prop, wd);
}
write_constraints(wd, &chan->constraints);
write_motionpath(wd, chan->mpath);
/* prevent crashes with autosave, when a bone duplicated in editmode has not yet been assigned to its posechannel */
if (chan->bone)
chan->selectflag= chan->bone->flag & BONE_SELECTED; /* gets restored on read, for library armatures */
/* prevent crashes with autosave,
* when a bone duplicated in editmode has not yet been assigned to its posechannel */
if (chan->bone) {
/* gets restored on read, for library armatures */
chan->selectflag = chan->bone->flag & BONE_SELECTED;
}
writestruct(wd, DATA, "bPoseChannel", 1, chan);
}
/* Write groups */
for (grp=pose->agroups.first; grp; grp=grp->next)
for (grp = pose->agroups.first; grp; grp = grp->next) {
writestruct(wd, DATA, "bActionGroup", 1, grp);
}
/* write IK param */
if (pose->ikparam) {
const char *structname = BKE_pose_ikparam_get_name(pose);
if (structname)
if (structname) {
writestruct(wd, DATA, structname, 1, pose->ikparam);
}
}
/* Write this pose */
@@ -1529,87 +1623,94 @@ static void write_pose(WriteData *wd, bPose *pose)
static void write_defgroups(WriteData *wd, ListBase *defbase)
{
bDeformGroup *defgroup;
for (defgroup=defbase->first; defgroup; defgroup=defgroup->next)
for (bDeformGroup *defgroup = defbase->first; defgroup; defgroup = defgroup->next) {
writestruct(wd, DATA, "bDeformGroup", 1, defgroup);
}
}
static void write_modifiers(WriteData *wd, ListBase *modbase)
{
ModifierData *md;
if (modbase == NULL) return;
for (md=modbase->first; md; md= md->next) {
if (modbase == NULL) {
return;
}
for (md = modbase->first; md; md = md->next) {
const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
if (mti == NULL) return;
if (mti == NULL) {
return;
}
writestruct(wd, DATA, mti->structName, 1, md);
if (md->type==eModifierType_Hook) {
HookModifierData *hmd = (HookModifierData*) md;
if (md->type == eModifierType_Hook) {
HookModifierData *hmd = (HookModifierData *)md;
if (hmd->curfalloff) {
write_curvemapping(wd, hmd->curfalloff);
}
writedata(wd, DATA, sizeof(int)*hmd->totindex, hmd->indexar);
writedata(wd, DATA, sizeof(int) * hmd->totindex, hmd->indexar);
}
else if (md->type==eModifierType_Cloth) {
ClothModifierData *clmd = (ClothModifierData*) md;
else if (md->type == eModifierType_Cloth) {
ClothModifierData *clmd = (ClothModifierData *)md;
writestruct(wd, DATA, "ClothSimSettings", 1, clmd->sim_parms);
writestruct(wd, DATA, "ClothCollSettings", 1, clmd->coll_parms);
writestruct(wd, DATA, "EffectorWeights", 1, clmd->sim_parms->effector_weights);
write_pointcaches(wd, &clmd->ptcaches);
}
else if (md->type==eModifierType_Smoke) {
SmokeModifierData *smd = (SmokeModifierData*) md;
else if (md->type == eModifierType_Smoke) {
SmokeModifierData *smd = (SmokeModifierData *)md;
if (smd->type & MOD_SMOKE_TYPE_DOMAIN) {
if (smd->domain) {
write_pointcaches(wd, &(smd->domain->ptcaches[0]));
/* create fake pointcache so that old blender versions can read it */
smd->domain->point_cache[1] = BKE_ptcache_add(&smd->domain->ptcaches[1]);
smd->domain->point_cache[1]->flag |= PTCACHE_DISK_CACHE|PTCACHE_FAKE_SMOKE;
smd->domain->point_cache[1]->flag |= PTCACHE_DISK_CACHE | PTCACHE_FAKE_SMOKE;
smd->domain->point_cache[1]->step = 1;
write_pointcaches(wd, &(smd->domain->ptcaches[1]));
}
writestruct(wd, DATA, "SmokeDomainSettings", 1, smd->domain);
if (smd->domain) {
/* cleanup the fake pointcache */
BKE_ptcache_free_list(&smd->domain->ptcaches[1]);
smd->domain->point_cache[1] = NULL;
writestruct(wd, DATA, "EffectorWeights", 1, smd->domain->effector_weights);
}
}
else if (smd->type & MOD_SMOKE_TYPE_FLOW)
else if (smd->type & MOD_SMOKE_TYPE_FLOW) {
writestruct(wd, DATA, "SmokeFlowSettings", 1, smd->flow);
else if (smd->type & MOD_SMOKE_TYPE_COLL)
}
else if (smd->type & MOD_SMOKE_TYPE_COLL) {
writestruct(wd, DATA, "SmokeCollSettings", 1, smd->coll);
}
}
else if (md->type==eModifierType_Fluidsim) {
FluidsimModifierData *fluidmd = (FluidsimModifierData*) md;
else if (md->type == eModifierType_Fluidsim) {
FluidsimModifierData *fluidmd = (FluidsimModifierData *)md;
writestruct(wd, DATA, "FluidsimSettings", 1, fluidmd->fss);
}
else if (md->type==eModifierType_DynamicPaint) {
DynamicPaintModifierData *pmd = (DynamicPaintModifierData*) md;
else if (md->type == eModifierType_DynamicPaint) {
DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
if (pmd->canvas) {
DynamicPaintSurface *surface;
writestruct(wd, DATA, "DynamicPaintCanvasSettings", 1, pmd->canvas);
/* write surfaces */
for (surface=pmd->canvas->surfaces.first; surface; surface=surface->next)
for (surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
writestruct(wd, DATA, "DynamicPaintSurface", 1, surface);
}
/* write caches and effector weights */
for (surface=pmd->canvas->surfaces.first; surface; surface=surface->next) {
for (surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
write_pointcaches(wd, &(surface->ptcaches));
writestruct(wd, DATA, "EffectorWeights", 1, surface->effector_weights);
@@ -1621,45 +1722,46 @@ static void write_modifiers(WriteData *wd, ListBase *modbase)
writestruct(wd, DATA, "ColorBand", 1, pmd->brush->vel_ramp);
}
}
else if (md->type==eModifierType_Collision) {
else if (md->type == eModifierType_Collision) {
#if 0
CollisionModifierData *collmd = (CollisionModifierData*) md;
// TODO: CollisionModifier should use pointcache
CollisionModifierData *collmd = (CollisionModifierData *)md;
// TODO: CollisionModifier should use pointcache
// + have proper reset events before enabling this
writestruct(wd, DATA, "MVert", collmd->numverts, collmd->x);
writestruct(wd, DATA, "MVert", collmd->numverts, collmd->xnew);
writestruct(wd, DATA, "MFace", collmd->numfaces, collmd->mfaces);
#endif
}
else if (md->type==eModifierType_MeshDeform) {
MeshDeformModifierData *mmd = (MeshDeformModifierData*) md;
else if (md->type == eModifierType_MeshDeform) {
MeshDeformModifierData *mmd = (MeshDeformModifierData *)md;
int size = mmd->dyngridsize;
writestruct(wd, DATA, "MDefInfluence", mmd->totinfluence, mmd->bindinfluences);
writedata(wd, DATA, sizeof(int) * (mmd->totvert + 1), mmd->bindoffsets);
writedata(wd, DATA, sizeof(float) * 3 * mmd->totcagevert,
mmd->bindcagecos);
writestruct(wd, DATA, "MDefCell", size*size*size, mmd->dyngrid);
mmd->bindcagecos);
writestruct(wd, DATA, "MDefCell", size * size * size, mmd->dyngrid);
writestruct(wd, DATA, "MDefInfluence", mmd->totinfluence, mmd->dyninfluences);
writedata(wd, DATA, sizeof(int)*mmd->totvert, mmd->dynverts);
writedata(wd, DATA, sizeof(int) * mmd->totvert, mmd->dynverts);
}
else if (md->type==eModifierType_Warp) {
WarpModifierData *tmd = (WarpModifierData*) md;
else if (md->type == eModifierType_Warp) {
WarpModifierData *tmd = (WarpModifierData *)md;
if (tmd->curfalloff) {
write_curvemapping(wd, tmd->curfalloff);
}
}
else if (md->type==eModifierType_WeightVGEdit) {
WeightVGEditModifierData *wmd = (WeightVGEditModifierData*) md;
else if (md->type == eModifierType_WeightVGEdit) {
WeightVGEditModifierData *wmd = (WeightVGEditModifierData *)md;
if (wmd->cmap_curve)
if (wmd->cmap_curve) {
write_curvemapping(wd, wmd->cmap_curve);
}
}
else if (md->type==eModifierType_LaplacianDeform) {
LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData*) md;
else if (md->type == eModifierType_LaplacianDeform) {
LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData *)md;
writedata(wd, DATA, sizeof(float)*lmd->total_verts * 3, lmd->vertexco);
writedata(wd, DATA, sizeof(float) * lmd->total_verts * 3, lmd->vertexco);
}
else if (md->type == eModifierType_CorrectiveSmooth) {
CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)md;
@@ -1674,19 +1776,21 @@ static void write_modifiers(WriteData *wd, ListBase *modbase)
static void write_objects(WriteData *wd, ListBase *idbase)
{
Object *ob;
ob= idbase->first;
ob = idbase->first;
while (ob) {
if (ob->id.us>0 || wd->current) {
if (ob->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_OB, "Object", 1, ob);
write_iddata(wd, &ob->id);
if (ob->adt) write_animdata(wd, ob->adt);
if (ob->adt) {
write_animdata(wd, ob->adt);
}
/* direct data */
writedata(wd, DATA, sizeof(void *)*ob->totcol, ob->mat);
writedata(wd, DATA, sizeof(char)*ob->totcol, ob->matbits);
writedata(wd, DATA, sizeof(void *) * ob->totcol, ob->mat);
writedata(wd, DATA, sizeof(char) * ob->totcol, ob->matbits);
/* write_effects(wd, &ob->effect); */ /* not used anymore */
write_properties(wd, &ob->prop);
write_sensors(wd, &ob->sensors);
@@ -1704,7 +1808,7 @@ static void write_objects(WriteData *wd, ListBase *idbase)
write_defgroups(wd, &ob->defbase);
write_constraints(wd, &ob->constraints);
write_motionpath(wd, ob->mpath);
writestruct(wd, DATA, "PartDeflect", 1, ob->pd);
writestruct(wd, DATA, "SoftBody", 1, ob->soft);
if (ob->soft) {
@@ -1712,9 +1816,9 @@ static void write_objects(WriteData *wd, ListBase *idbase)
writestruct(wd, DATA, "EffectorWeights", 1, ob->soft->effector_weights);
}
writestruct(wd, DATA, "BulletSoftBody", 1, ob->bsoft);
if (ob->rigidbody_object) {
// TODO: if any extra data is added to handle duplis, will need separate function then
/* TODO: if any extra data is added to handle duplis, will need separate function then */
writestruct(wd, DATA, "RigidBodyOb", 1, ob->rigidbody_object);
}
if (ob->rigidbody_constraint) {
@@ -1734,7 +1838,7 @@ static void write_objects(WriteData *wd, ListBase *idbase)
write_previews(wd, ob->preview);
ob= ob->id.next;
ob = ob->id.next;
}
/* flush helps the compression for undo-save */
@@ -1745,11 +1849,11 @@ static void write_objects(WriteData *wd, ListBase *idbase)
static void write_vfonts(WriteData *wd, ListBase *idbase)
{
VFont *vf;
PackedFile * pf;
PackedFile *pf;
vf= idbase->first;
vf = idbase->first;
while (vf) {
if (vf->id.us>0 || wd->current) {
if (vf->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_VF, "VFont", 1, vf);
write_iddata(wd, &vf->id);
@@ -1763,7 +1867,7 @@ static void write_vfonts(WriteData *wd, ListBase *idbase)
}
}
vf= vf->id.next;
vf = vf->id.next;
}
}
@@ -1773,25 +1877,29 @@ static void write_keys(WriteData *wd, ListBase *idbase)
Key *key;
KeyBlock *kb;
key= idbase->first;
key = idbase->first;
while (key) {
if (key->id.us>0 || wd->current) {
if (key->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_KE, "Key", 1, key);
write_iddata(wd, &key->id);
if (key->adt) write_animdata(wd, key->adt);
if (key->adt) {
write_animdata(wd, key->adt);
}
/* direct data */
kb= key->block.first;
kb = key->block.first;
while (kb) {
writestruct(wd, DATA, "KeyBlock", 1, kb);
if (kb->data) writedata(wd, DATA, kb->totelem*key->elemsize, kb->data);
kb= kb->next;
if (kb->data) {
writedata(wd, DATA, kb->totelem * key->elemsize, kb->data);
}
kb = kb->next;
}
}
key= key->id.next;
key = key->id.next;
}
/* flush helps the compression for undo-save */
mywrite(wd, MYWRITE_FLUSH, 0);
@@ -1801,17 +1909,19 @@ static void write_cameras(WriteData *wd, ListBase *idbase)
{
Camera *cam;
cam= idbase->first;
cam = idbase->first;
while (cam) {
if (cam->id.us>0 || wd->current) {
if (cam->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_CA, "Camera", 1, cam);
write_iddata(wd, &cam->id);
if (cam->adt) write_animdata(wd, cam->adt);
if (cam->adt) {
write_animdata(wd, cam->adt);
}
}
cam= cam->id.next;
cam = cam->id.next;
}
}
@@ -1820,24 +1930,26 @@ static void write_mballs(WriteData *wd, ListBase *idbase)
MetaBall *mb;
MetaElem *ml;
mb= idbase->first;
mb = idbase->first;
while (mb) {
if (mb->id.us>0 || wd->current) {
if (mb->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_MB, "MetaBall", 1, mb);
write_iddata(wd, &mb->id);
/* direct data */
writedata(wd, DATA, sizeof(void *)*mb->totcol, mb->mat);
if (mb->adt) write_animdata(wd, mb->adt);
writedata(wd, DATA, sizeof(void *) * mb->totcol, mb->mat);
if (mb->adt) {
write_animdata(wd, mb->adt);
}
ml= mb->elems.first;
ml = mb->elems.first;
while (ml) {
writestruct(wd, DATA, "MetaElem", 1, ml);
ml= ml->next;
ml = ml->next;
}
}
mb= mb->id.next;
mb = mb->id.next;
}
}
@@ -1846,17 +1958,19 @@ static void write_curves(WriteData *wd, ListBase *idbase)
Curve *cu;
Nurb *nu;
cu= idbase->first;
cu = idbase->first;
while (cu) {
if (cu->id.us>0 || wd->current) {
if (cu->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_CU, "Curve", 1, cu);
write_iddata(wd, &cu->id);
/* direct data */
writedata(wd, DATA, sizeof(void *)*cu->totcol, cu->mat);
if (cu->adt) write_animdata(wd, cu->adt);
writedata(wd, DATA, sizeof(void *) * cu->totcol, cu->mat);
if (cu->adt) {
write_animdata(wd, cu->adt);
}
if (cu->vfont) {
writedata(wd, DATA, cu->len + 1, cu->str);
writestruct(wd, DATA, "CharInfo", cu->len_wchar + 1, cu->strinfo);
@@ -1864,25 +1978,30 @@ static void write_curves(WriteData *wd, ListBase *idbase)
}
else {
/* is also the order of reading */
nu= cu->nurb.first;
nu = cu->nurb.first;
while (nu) {
writestruct(wd, DATA, "Nurb", 1, nu);
nu= nu->next;
nu = nu->next;
}
nu= cu->nurb.first;
nu = cu->nurb.first;
while (nu) {
if (nu->type == CU_BEZIER)
if (nu->type == CU_BEZIER) {
writestruct(wd, DATA, "BezTriple", nu->pntsu, nu->bezt);
else {
writestruct(wd, DATA, "BPoint", nu->pntsu*nu->pntsv, nu->bp);
if (nu->knotsu) writedata(wd, DATA, KNOTSU(nu)*sizeof(float), nu->knotsu);
if (nu->knotsv) writedata(wd, DATA, KNOTSV(nu)*sizeof(float), nu->knotsv);
}
nu= nu->next;
else {
writestruct(wd, DATA, "BPoint", nu->pntsu * nu->pntsv, nu->bp);
if (nu->knotsu) {
writedata(wd, DATA, KNOTSU(nu) * sizeof(float), nu->knotsu);
}
if (nu->knotsv) {
writedata(wd, DATA, KNOTSV(nu) * sizeof(float), nu->knotsv);
}
}
nu = nu->next;
}
}
}
cu= cu->id.next;
cu = cu->id.next;
}
/* flush helps the compression for undo-save */
@@ -1892,15 +2011,15 @@ static void write_curves(WriteData *wd, ListBase *idbase)
static void write_dverts(WriteData *wd, int count, MDeformVert *dvlist)
{
if (dvlist) {
int i;
/* Write the dvert list */
writestruct(wd, DATA, "MDeformVert", count, dvlist);
/* Write deformation data for each dvert */
for (i=0; i<count; i++) {
if (dvlist[i].dw)
for (int i = 0; i < count; i++) {
if (dvlist[i].dw) {
writestruct(wd, DATA, "MDeformWeight", dvlist[i].totweight, dvlist[i].dw);
}
}
}
}
@@ -1909,17 +2028,19 @@ static void write_mdisps(WriteData *wd, int count, MDisps *mdlist, int external)
{
if (mdlist) {
int i;
writestruct(wd, DATA, "MDisps", count, mdlist);
for (i = 0; i < count; ++i) {
MDisps *md = &mdlist[i];
if (md->disps) {
if (!external)
if (!external) {
writedata(wd, DATA, sizeof(float) * 3 * md->totdisp, md->disps);
}
}
if (md->hidden)
if (md->hidden) {
writedata(wd, DATA, BLI_BITMAP_SIZE(md->totdisp), md->hidden);
}
}
}
}
@@ -1928,7 +2049,7 @@ static void write_grid_paint_mask(WriteData *wd, int count, GridPaintMask *grid_
{
if (grid_paint_mask) {
int i;
writestruct(wd, DATA, "GridPaintMask", count, grid_paint_mask);
for (i = 0; i < count; ++i) {
GridPaintMask *gpm = &grid_paint_mask[i];
@@ -1949,11 +2070,12 @@ static void write_customdata(
int i;
/* write external customdata (not for undo) */
if (data->external && !wd->current)
if (data->external && !wd->current) {
CustomData_external_write(data, id, CD_MASK_MESH, count, 0);
}
writestruct_at_address(wd, DATA, "CustomDataLayer", data->totlayer, data->layers, layers);
for (i = 0; i < data->totlayer; i++) {
CustomDataLayer *layer = &layers[i];
const char *structname;
@@ -1979,8 +2101,12 @@ static void write_customdata(
/* when using partial visibility, the MEdge and MFace layers
* are smaller than the original, so their type and count is
* passed to make this work */
if (layer->type != partial_type) datasize= structnum*count;
else datasize= structnum*partial_count;
if (layer->type != partial_type) {
datasize = structnum * count;
}
else {
datasize = structnum * partial_count;
}
writestruct(wd, DATA, structname, datasize, layer->data);
}
@@ -1991,20 +2117,21 @@ static void write_customdata(
}
}
if (data->external)
if (data->external) {
writestruct(wd, DATA, "CustomDataExternal", 1, data->external);
}
}
static void write_meshes(WriteData *wd, ListBase *idbase)
{
Mesh *mesh;
int save_for_old_blender= 0;
int save_for_old_blender = 0;
#ifdef USE_BMESH_SAVE_AS_COMPAT
save_for_old_blender = wd->use_mesh_compat; /* option to save with older mesh format */
#endif
mesh= idbase->first;
mesh = idbase->first;
while (mesh) {
CustomDataLayer *vlayers = NULL, vlayers_buff[CD_TEMP_CHUNK_SIZE];
CustomDataLayer *elayers = NULL, elayers_buff[CD_TEMP_CHUNK_SIZE];
@@ -2012,7 +2139,7 @@ static void write_meshes(WriteData *wd, ListBase *idbase)
CustomDataLayer *llayers = NULL, llayers_buff[CD_TEMP_CHUNK_SIZE];
CustomDataLayer *players = NULL, players_buff[CD_TEMP_CHUNK_SIZE];
if (mesh->id.us>0 || wd->current) {
if (mesh->id.us > 0 || wd->current) {
/* write LibData */
if (!save_for_old_blender) {
/* write a copy of the mesh, don't modify in place because it is
@@ -2049,9 +2176,11 @@ static void write_meshes(WriteData *wd, ListBase *idbase)
write_iddata(wd, &mesh->id);
/* direct data */
if (mesh->adt) write_animdata(wd, mesh->adt);
if (mesh->adt) {
write_animdata(wd, mesh->adt);
}
writedata(wd, DATA, sizeof(void *)*mesh->totcol, mesh->mat);
writedata(wd, DATA, sizeof(void *) * mesh->totcol, mesh->mat);
writedata(wd, DATA, sizeof(MSelect) * mesh->totselect, mesh->mselect);
write_customdata(wd, &mesh->id, mesh->totvert, &mesh->vdata, vlayers, -1, 0);
@@ -2107,9 +2236,11 @@ static void write_meshes(WriteData *wd, ListBase *idbase)
write_iddata(wd, &mesh->id);
/* direct data */
if (mesh->adt) write_animdata(wd, mesh->adt);
if (mesh->adt) {
write_animdata(wd, mesh->adt);
}
writedata(wd, DATA, sizeof(void *)*mesh->totcol, mesh->mat);
writedata(wd, DATA, sizeof(void *) * mesh->totcol, mesh->mat);
/* writedata(wd, DATA, sizeof(MSelect) * mesh->totselect, mesh->mselect); */ /* pre-bmesh NULL's */
write_customdata(wd, &mesh->id, mesh->totvert, &mesh->vdata, vlayers, -1, 0);
@@ -2146,44 +2277,46 @@ static void write_meshes(WriteData *wd, ListBase *idbase)
MEM_freeN(players);
}
mesh= mesh->id.next;
mesh = mesh->id.next;
}
}
static void write_lattices(WriteData *wd, ListBase *idbase)
{
Lattice *lt;
lt= idbase->first;
lt = idbase->first;
while (lt) {
if (lt->id.us>0 || wd->current) {
if (lt->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_LT, "Lattice", 1, lt);
write_iddata(wd, &lt->id);
/* write animdata */
if (lt->adt) write_animdata(wd, lt->adt);
if (lt->adt) {
write_animdata(wd, lt->adt);
}
/* direct data */
writestruct(wd, DATA, "BPoint", lt->pntsu*lt->pntsv*lt->pntsw, lt->def);
write_dverts(wd, lt->pntsu*lt->pntsv*lt->pntsw, lt->dvert);
writestruct(wd, DATA, "BPoint", lt->pntsu * lt->pntsv * lt->pntsw, lt->def);
write_dverts(wd, lt->pntsu * lt->pntsv * lt->pntsw, lt->dvert);
}
lt= lt->id.next;
lt = lt->id.next;
}
}
static void write_images(WriteData *wd, ListBase *idbase)
{
Image *ima;
PackedFile * pf;
PackedFile *pf;
ImageView *iv;
ImagePackedFile *imapf;
ima= idbase->first;
ima = idbase->first;
while (ima) {
if (ima->id.us>0 || wd->current) {
if (ima->id.us > 0 || wd->current) {
/* Some trickery to keep forward compatibility of packed images. */
BLI_assert(ima->packedfile == NULL);
if (ima->packedfiles.first != NULL) {
@@ -2206,13 +2339,14 @@ static void write_images(WriteData *wd, ListBase *idbase)
write_previews(wd, ima->preview);
for (iv = ima->views.first; iv; iv = iv->next)
for (iv = ima->views.first; iv; iv = iv->next) {
writestruct(wd, DATA, "ImageView", 1, iv);
}
writestruct(wd, DATA, "Stereo3dFormat", 1, ima->stereo3d_format);
ima->packedfile = NULL;
}
ima= ima->id.next;
ima = ima->id.next;
}
/* flush helps the compression for undo-save */
mywrite(wd, MYWRITE_FLUSH, 0);
@@ -2222,35 +2356,49 @@ static void write_textures(WriteData *wd, ListBase *idbase)
{
Tex *tex;
tex= idbase->first;
tex = idbase->first;
while (tex) {
if (tex->id.us>0 || wd->current) {
if (tex->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_TE, "Tex", 1, tex);
write_iddata(wd, &tex->id);
if (tex->adt) write_animdata(wd, tex->adt);
if (tex->adt) {
write_animdata(wd, tex->adt);
}
/* direct data */
if (tex->coba) writestruct(wd, DATA, "ColorBand", 1, tex->coba);
if (tex->type == TEX_ENVMAP && tex->env) writestruct(wd, DATA, "EnvMap", 1, tex->env);
if (tex->coba) {
writestruct(wd, DATA, "ColorBand", 1, tex->coba);
}
if (tex->type == TEX_ENVMAP && tex->env) {
writestruct(wd, DATA, "EnvMap", 1, tex->env);
}
if (tex->type == TEX_POINTDENSITY && tex->pd) {
writestruct(wd, DATA, "PointDensity", 1, tex->pd);
if (tex->pd->coba) writestruct(wd, DATA, "ColorBand", 1, tex->pd->coba);
if (tex->pd->falloff_curve) write_curvemapping(wd, tex->pd->falloff_curve);
if (tex->pd->coba) {
writestruct(wd, DATA, "ColorBand", 1, tex->pd->coba);
}
if (tex->pd->falloff_curve) {
write_curvemapping(wd, tex->pd->falloff_curve);
}
}
if (tex->type == TEX_VOXELDATA) writestruct(wd, DATA, "VoxelData", 1, tex->vd);
if (tex->type == TEX_OCEAN && tex->ot) writestruct(wd, DATA, "OceanTex", 1, tex->ot);
if (tex->type == TEX_VOXELDATA) {
writestruct(wd, DATA, "VoxelData", 1, tex->vd);
}
if (tex->type == TEX_OCEAN && tex->ot) {
writestruct(wd, DATA, "OceanTex", 1, tex->ot);
}
/* nodetree is integral part of texture, no libdata */
if (tex->nodetree) {
writestruct(wd, DATA, "bNodeTree", 1, tex->nodetree);
write_nodetree(wd, tex->nodetree);
}
write_previews(wd, tex->preview);
}
tex= tex->id.next;
tex = tex->id.next;
}
/* flush helps the compression for undo-save */
@@ -2262,22 +2410,30 @@ static void write_materials(WriteData *wd, ListBase *idbase)
Material *ma;
int a;
ma= idbase->first;
ma = idbase->first;
while (ma) {
if (ma->id.us>0 || wd->current) {
if (ma->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_MA, "Material", 1, ma);
write_iddata(wd, &ma->id);
if (ma->adt) write_animdata(wd, ma->adt);
for (a=0; a<MAX_MTEX; a++) {
if (ma->mtex[a]) writestruct(wd, DATA, "MTex", 1, ma->mtex[a]);
if (ma->adt) {
write_animdata(wd, ma->adt);
}
if (ma->ramp_col) writestruct(wd, DATA, "ColorBand", 1, ma->ramp_col);
if (ma->ramp_spec) writestruct(wd, DATA, "ColorBand", 1, ma->ramp_spec);
for (a = 0; a < MAX_MTEX; a++) {
if (ma->mtex[a]) {
writestruct(wd, DATA, "MTex", 1, ma->mtex[a]);
}
}
if (ma->ramp_col) {
writestruct(wd, DATA, "ColorBand", 1, ma->ramp_col);
}
if (ma->ramp_spec) {
writestruct(wd, DATA, "ColorBand", 1, ma->ramp_spec);
}
/* nodetree is integral part of material, no libdata */
if (ma->nodetree) {
writestruct(wd, DATA, "bNodeTree", 1, ma->nodetree);
@@ -2286,7 +2442,7 @@ static void write_materials(WriteData *wd, ListBase *idbase)
write_previews(wd, ma->preview);
}
ma= ma->id.next;
ma = ma->id.next;
}
}
@@ -2295,17 +2451,21 @@ static void write_worlds(WriteData *wd, ListBase *idbase)
World *wrld;
int a;
wrld= idbase->first;
wrld = idbase->first;
while (wrld) {
if (wrld->id.us>0 || wd->current) {
if (wrld->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_WO, "World", 1, wrld);
write_iddata(wd, &wrld->id);
if (wrld->adt) write_animdata(wd, wrld->adt);
for (a=0; a<MAX_MTEX; a++) {
if (wrld->mtex[a]) writestruct(wd, DATA, "MTex", 1, wrld->mtex[a]);
if (wrld->adt) {
write_animdata(wd, wrld->adt);
}
for (a = 0; a < MAX_MTEX; a++) {
if (wrld->mtex[a]) {
writestruct(wd, DATA, "MTex", 1, wrld->mtex[a]);
}
}
/* nodetree is integral part of world, no libdata */
@@ -2313,10 +2473,10 @@ static void write_worlds(WriteData *wd, ListBase *idbase)
writestruct(wd, DATA, "bNodeTree", 1, wrld->nodetree);
write_nodetree(wd, wrld->nodetree);
}
write_previews(wd, wrld->preview);
}
wrld= wrld->id.next;
wrld = wrld->id.next;
}
}
@@ -2325,23 +2485,28 @@ static void write_lamps(WriteData *wd, ListBase *idbase)
Lamp *la;
int a;
la= idbase->first;
la = idbase->first;
while (la) {
if (la->id.us>0 || wd->current) {
if (la->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_LA, "Lamp", 1, la);
write_iddata(wd, &la->id);
if (la->adt) write_animdata(wd, la->adt);
/* direct data */
for (a=0; a<MAX_MTEX; a++) {
if (la->mtex[a]) writestruct(wd, DATA, "MTex", 1, la->mtex[a]);
if (la->adt) {
write_animdata(wd, la->adt);
}
if (la->curfalloff)
/* direct data */
for (a = 0; a < MAX_MTEX; a++) {
if (la->mtex[a]) {
writestruct(wd, DATA, "MTex", 1, la->mtex[a]);
}
}
if (la->curfalloff) {
write_curvemapping(wd, la->curfalloff);
}
/* nodetree is integral part of lamps, no libdata */
if (la->nodetree) {
writestruct(wd, DATA, "bNodeTree", 1, la->nodetree);
@@ -2349,9 +2514,9 @@ static void write_lamps(WriteData *wd, ListBase *idbase)
}
write_previews(wd, la->preview);
}
la= la->id.next;
la = la->id.next;
}
}
@@ -2366,12 +2531,12 @@ static void write_sequence_modifiers(WriteData *wd, ListBase *modbase)
writestruct(wd, DATA, smti->struct_name, 1, smd);
if (smd->type == seqModifierType_Curves) {
CurvesModifierData *cmd = (CurvesModifierData *) smd;
CurvesModifierData *cmd = (CurvesModifierData *)smd;
write_curvemapping(wd, &cmd->curve_mapping);
}
else if (smd->type == seqModifierType_HueCorrect) {
HueCorrectModifierData *hcmd = (HueCorrectModifierData *) smd;
HueCorrectModifierData *hcmd = (HueCorrectModifierData *)smd;
write_curvemapping(wd, &hcmd->curve_mapping);
}
@@ -2391,8 +2556,9 @@ static void write_view_settings(WriteData *wd, ColorManagedViewSettings *view_se
static void write_paint(WriteData *wd, Paint *p)
{
if (p->cavity_curve)
if (p->cavity_curve) {
write_curvemapping(wd, p->cavity_curve);
}
}
static void write_scenes(WriteData *wd, ListBase *scebase)
@@ -2410,23 +2576,25 @@ static void write_scenes(WriteData *wd, ListBase *scebase)
ToolSettings *tos;
FreestyleModuleConfig *fmc;
FreestyleLineSet *fls;
sce= scebase->first;
sce = scebase->first;
while (sce) {
/* write LibData */
writestruct(wd, ID_SCE, "Scene", 1, sce);
write_iddata(wd, &sce->id);
if (sce->adt) write_animdata(wd, sce->adt);
if (sce->adt) {
write_animdata(wd, sce->adt);
}
write_keyingsets(wd, &sce->keyingsets);
/* direct data */
base= sce->base.first;
base = sce->base.first;
while (base) {
writestruct(wd, DATA, "Base", 1, base);
base= base->next;
base = base->next;
}
tos = sce->toolsettings;
writestruct(wd, DATA, "ToolSettings", 1, tos);
if (tos->vpaint) {
@@ -2448,53 +2616,55 @@ static void write_scenes(WriteData *wd, ListBase *scebase)
write_paint(wd, &tos->imapaint.paint);
ed= sce->ed;
ed = sce->ed;
if (ed) {
writestruct(wd, DATA, "Editing", 1, ed);
/* reset write flags too */
SEQ_BEGIN (ed, seq)
SEQ_BEGIN(ed, seq)
{
if (seq->strip) seq->strip->done = false;
if (seq->strip) {
seq->strip->done = false;
}
writestruct(wd, DATA, "Sequence", 1, seq);
}
SEQ_END
SEQ_BEGIN (ed, seq)
SEQ_BEGIN(ed, seq)
{
if (seq->strip && seq->strip->done==0) {
if (seq->strip && seq->strip->done == 0) {
/* write strip with 'done' at 0 because readfile */
if (seq->effectdata) {
switch (seq->type) {
case SEQ_TYPE_COLOR:
writestruct(wd, DATA, "SolidColorVars", 1, seq->effectdata);
break;
case SEQ_TYPE_SPEED:
writestruct(wd, DATA, "SpeedControlVars", 1, seq->effectdata);
break;
case SEQ_TYPE_WIPE:
writestruct(wd, DATA, "WipeVars", 1, seq->effectdata);
break;
case SEQ_TYPE_GLOW:
writestruct(wd, DATA, "GlowVars", 1, seq->effectdata);
break;
case SEQ_TYPE_TRANSFORM:
writestruct(wd, DATA, "TransformVars", 1, seq->effectdata);
break;
case SEQ_TYPE_GAUSSIAN_BLUR:
writestruct(wd, DATA, "GaussianBlurVars", 1, seq->effectdata);
break;
case SEQ_TYPE_TEXT:
writestruct(wd, DATA, "TextVars", 1, seq->effectdata);
break;
case SEQ_TYPE_COLOR:
writestruct(wd, DATA, "SolidColorVars", 1, seq->effectdata);
break;
case SEQ_TYPE_SPEED:
writestruct(wd, DATA, "SpeedControlVars", 1, seq->effectdata);
break;
case SEQ_TYPE_WIPE:
writestruct(wd, DATA, "WipeVars", 1, seq->effectdata);
break;
case SEQ_TYPE_GLOW:
writestruct(wd, DATA, "GlowVars", 1, seq->effectdata);
break;
case SEQ_TYPE_TRANSFORM:
writestruct(wd, DATA, "TransformVars", 1, seq->effectdata);
break;
case SEQ_TYPE_GAUSSIAN_BLUR:
writestruct(wd, DATA, "GaussianBlurVars", 1, seq->effectdata);
break;
case SEQ_TYPE_TEXT:
writestruct(wd, DATA, "TextVars", 1, seq->effectdata);
break;
}
}
writestruct(wd, DATA, "Stereo3dFormat", 1, seq->stereo3d_format);
strip= seq->strip;
strip = seq->strip;
writestruct(wd, DATA, "Strip", 1, strip);
if (seq->flag & SEQ_USE_CROP && strip->crop) {
writestruct(wd, DATA, "StripCrop", 1, strip->crop);
@@ -2505,11 +2675,15 @@ static void write_scenes(WriteData *wd, ListBase *scebase)
if (seq->flag & SEQ_USE_PROXY && strip->proxy) {
writestruct(wd, DATA, "StripProxy", 1, strip->proxy);
}
if (seq->type==SEQ_TYPE_IMAGE)
writestruct(wd, DATA, "StripElem", MEM_allocN_len(strip->stripdata) / sizeof(struct StripElem), strip->stripdata);
else if (seq->type==SEQ_TYPE_MOVIE || seq->type==SEQ_TYPE_SOUND_RAM || seq->type == SEQ_TYPE_SOUND_HD)
if (seq->type == SEQ_TYPE_IMAGE) {
writestruct(wd, DATA, "StripElem",
MEM_allocN_len(strip->stripdata) / sizeof(struct StripElem),
strip->stripdata);
}
else if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SOUND_HD)) {
writestruct(wd, DATA, "StripElem", 1, strip->stripdata);
}
strip->done = true;
}
@@ -2520,35 +2694,43 @@ static void write_scenes(WriteData *wd, ListBase *scebase)
write_sequence_modifiers(wd, &seq->modifiers);
}
SEQ_END
/* new; meta stack too, even when its nasty restore code */
for (ms= ed->metastack.first; ms; ms= ms->next) {
for (ms = ed->metastack.first; ms; ms = ms->next) {
writestruct(wd, DATA, "MetaStack", 1, ms);
}
}
if (sce->r.avicodecdata) {
writestruct(wd, DATA, "AviCodecData", 1, sce->r.avicodecdata);
if (sce->r.avicodecdata->lpFormat) writedata(wd, DATA, sce->r.avicodecdata->cbFormat, sce->r.avicodecdata->lpFormat);
if (sce->r.avicodecdata->lpParms) writedata(wd, DATA, sce->r.avicodecdata->cbParms, sce->r.avicodecdata->lpParms);
if (sce->r.avicodecdata->lpFormat) {
writedata(wd, DATA, sce->r.avicodecdata->cbFormat, sce->r.avicodecdata->lpFormat);
}
if (sce->r.avicodecdata->lpParms) {
writedata(wd, DATA, sce->r.avicodecdata->cbParms, sce->r.avicodecdata->lpParms);
}
}
if (sce->r.qtcodecdata) {
writestruct(wd, DATA, "QuicktimeCodecData", 1, sce->r.qtcodecdata);
if (sce->r.qtcodecdata->cdParms) writedata(wd, DATA, sce->r.qtcodecdata->cdSize, sce->r.qtcodecdata->cdParms);
if (sce->r.qtcodecdata->cdParms) {
writedata(wd, DATA, sce->r.qtcodecdata->cdSize, sce->r.qtcodecdata->cdParms);
}
}
if (sce->r.ffcodecdata.properties) {
IDP_WriteProperty(sce->r.ffcodecdata.properties, wd);
}
/* writing dynamic list of TimeMarkers to the blend file */
for (marker= sce->markers.first; marker; marker= marker->next)
for (marker = sce->markers.first; marker; marker = marker->next) {
writestruct(wd, DATA, "TimeMarker", 1, marker);
}
/* writing dynamic list of TransformOrientations to the blend file */
for (ts = sce->transform_spaces.first; ts; ts = ts->next)
for (ts = sce->transform_spaces.first; ts; ts = ts->next) {
writestruct(wd, DATA, "TransformOrientation", 1, ts);
}
for (srl = sce->r.layers.first; srl; srl = srl->next) {
writestruct(wd, DATA, "SceneRenderLayer", 1, srl);
for (fmc = srl->freestyleConfig.modules.first; fmc; fmc = fmc->next) {
@@ -2560,27 +2742,28 @@ static void write_scenes(WriteData *wd, ListBase *scebase)
}
/* writing MultiView to the blend file */
for (srv = sce->r.views.first; srv; srv = srv->next)
for (srv = sce->r.views.first; srv; srv = srv->next) {
writestruct(wd, DATA, "SceneRenderView", 1, srv);
}
if (sce->nodetree) {
writestruct(wd, DATA, "bNodeTree", 1, sce->nodetree);
write_nodetree(wd, sce->nodetree);
}
write_view_settings(wd, &sce->view_settings);
/* writing RigidBodyWorld data to the blend file */
if (sce->rigidbody_world) {
writestruct(wd, DATA, "RigidBodyWorld", 1, sce->rigidbody_world);
writestruct(wd, DATA, "EffectorWeights", 1, sce->rigidbody_world->effector_weights);
write_pointcaches(wd, &(sce->rigidbody_world->ptcaches));
}
write_previews(wd, sce->preview);
write_curvemapping_curves(wd, &sce->r.mblur_shutter_curve);
sce= sce->id.next;
sce = sce->id.next;
}
/* flush helps the compression for undo-save */
mywrite(wd, MYWRITE_FLUSH, 0);
@@ -2592,26 +2775,28 @@ static void write_gpencils(WriteData *wd, ListBase *lb)
bGPDlayer *gpl;
bGPDframe *gpf;
bGPDstroke *gps;
for (gpd= lb->first; gpd; gpd= gpd->id.next) {
if (gpd->id.us>0 || wd->current) {
for (gpd = lb->first; gpd; gpd = gpd->id.next) {
if (gpd->id.us > 0 || wd->current) {
/* write gpd data block to file */
writestruct(wd, ID_GD, "bGPdata", 1, gpd);
write_iddata(wd, &gpd->id);
if (gpd->adt) write_animdata(wd, gpd->adt);
if (gpd->adt) {
write_animdata(wd, gpd->adt);
}
/* write grease-pencil layers to file */
writelist(wd, DATA, "bGPDlayer", &gpd->layers);
for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
for (gpl = gpd->layers.first; gpl; gpl = gpl->next) {
/* write this layer's frames to file */
writelist(wd, DATA, "bGPDframe", &gpl->frames);
for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
for (gpf = gpl->frames.first; gpf; gpf = gpf->next) {
/* write strokes */
writelist(wd, DATA, "bGPDstroke", &gpf->strokes);
for (gps= gpf->strokes.first; gps; gps= gps->next) {
for (gps = gpf->strokes.first; gps; gps = gps->next) {
writestruct(wd, DATA, "bGPDspoint", gps->totpoints, gps->points);
}
}
@@ -2624,12 +2809,12 @@ static void write_windowmanagers(WriteData *wd, ListBase *lb)
{
wmWindowManager *wm;
wmWindow *win;
for (wm= lb->first; wm; wm= wm->id.next) {
for (wm = lb->first; wm; wm = wm->id.next) {
writestruct(wd, ID_WM, "wmWindowManager", 1, wm);
write_iddata(wd, &wm->id);
for (win= wm->windows.first; win; win= win->next) {
for (win = wm->windows.first; win; win = win->next) {
writestruct(wd, DATA, "wmWindow", 1, win);
writestruct(wd, DATA, "Stereo3dFormat", 1, win->stereo3d_format);
}
@@ -2637,20 +2822,22 @@ static void write_windowmanagers(WriteData *wd, ListBase *lb)
}
static void write_region(WriteData *wd, ARegion *ar, int spacetype)
{
{
writestruct(wd, DATA, "ARegion", 1, ar);
if (ar->regiondata) {
switch (spacetype) {
case SPACE_VIEW3D:
if (ar->regiontype==RGN_TYPE_WINDOW) {
RegionView3D *rv3d= ar->regiondata;
if (ar->regiontype == RGN_TYPE_WINDOW) {
RegionView3D *rv3d = ar->regiondata;
writestruct(wd, DATA, "RegionView3D", 1, rv3d);
if (rv3d->localvd)
if (rv3d->localvd) {
writestruct(wd, DATA, "RegionView3D", 1, rv3d->localvd);
if (rv3d->clipbb)
}
if (rv3d->clipbb) {
writestruct(wd, DATA, "BoundBox", 1, rv3d->clipbb);
}
}
else
@@ -2674,7 +2861,7 @@ static void write_uilist(WriteData *wd, uiList *ui_list)
static void write_soops(WriteData *wd, SpaceOops *so, LinkNode **tmp_mem_list)
{
BLI_mempool *ts = so->treestore;
if (ts) {
int elems = BLI_mempool_count(ts);
/* linearize mempool to array */
@@ -2686,7 +2873,7 @@ static void write_soops(WriteData *wd, SpaceOops *so, LinkNode **tmp_mem_list)
ts_flat->usedelem = elems;
ts_flat->totelem = elems;
ts_flat->data = data;
/* temporarily replace mempool-treestore by flat-treestore */
so->treestore = (BLI_mempool *)ts_flat;
writestruct(wd, DATA, "SpaceOops", 1, so);
@@ -2722,208 +2909,225 @@ static void write_screens(WriteData *wd, ListBase *scrbase)
ScrEdge *se;
LinkNode *tmp_mem_list = NULL;
sc= scrbase->first;
sc = scrbase->first;
while (sc) {
/* write LibData */
/* in 2.50+ files, the file identifier for screens is patched, forward compatibility */
writestruct(wd, ID_SCRN, "Screen", 1, sc);
write_iddata(wd, &sc->id);
/* direct data */
for (sv= sc->vertbase.first; sv; sv= sv->next)
for (sv = sc->vertbase.first; sv; sv = sv->next) {
writestruct(wd, DATA, "ScrVert", 1, sv);
for (se= sc->edgebase.first; se; se= se->next)
}
for (se = sc->edgebase.first; se; se = se->next) {
writestruct(wd, DATA, "ScrEdge", 1, se);
for (sa= sc->areabase.first; sa; sa= sa->next) {
}
for (sa = sc->areabase.first; sa; sa = sa->next) {
SpaceLink *sl;
Panel *pa;
uiList *ui_list;
uiPreview *ui_preview;
PanelCategoryStack *pc_act;
ARegion *ar;
writestruct(wd, DATA, "ScrArea", 1, sa);
for (ar= sa->regionbase.first; ar; ar= ar->next) {
for (ar = sa->regionbase.first; ar; ar = ar->next) {
write_region(wd, ar, sa->spacetype);
for (pa= ar->panels.first; pa; pa= pa->next)
for (pa = ar->panels.first; pa; pa = pa->next) {
writestruct(wd, DATA, "Panel", 1, pa);
for (pc_act = ar->panels_category_active.first; pc_act; pc_act = pc_act->next)
}
for (pc_act = ar->panels_category_active.first; pc_act; pc_act = pc_act->next) {
writestruct(wd, DATA, "PanelCategoryStack", 1, pc_act);
}
for (ui_list = ar->ui_lists.first; ui_list; ui_list = ui_list->next)
for (ui_list = ar->ui_lists.first; ui_list; ui_list = ui_list->next) {
write_uilist(wd, ui_list);
}
for (ui_preview = ar->ui_previews.first; ui_preview; ui_preview = ui_preview->next)
for (ui_preview = ar->ui_previews.first; ui_preview; ui_preview = ui_preview->next) {
writestruct(wd, DATA, "uiPreview", 1, ui_preview);
}
}
sl= sa->spacedata.first;
sl = sa->spacedata.first;
while (sl) {
for (ar= sl->regionbase.first; ar; ar= ar->next)
for (ar = sl->regionbase.first; ar; ar = ar->next) {
write_region(wd, ar, sl->spacetype);
if (sl->spacetype==SPACE_VIEW3D) {
View3D *v3d= (View3D *) sl;
}
if (sl->spacetype == SPACE_VIEW3D) {
View3D *v3d = (View3D *)sl;
BGpic *bgpic;
writestruct(wd, DATA, "View3D", 1, v3d);
for (bgpic= v3d->bgpicbase.first; bgpic; bgpic= bgpic->next)
for (bgpic = v3d->bgpicbase.first; bgpic; bgpic = bgpic->next) {
writestruct(wd, DATA, "BGpic", 1, bgpic);
if (v3d->localvd) writestruct(wd, DATA, "View3D", 1, v3d->localvd);
}
if (v3d->localvd) {
writestruct(wd, DATA, "View3D", 1, v3d->localvd);
}
if (v3d->fx_settings.ssao)
if (v3d->fx_settings.ssao) {
writestruct(wd, DATA, "GPUSSAOSettings", 1, v3d->fx_settings.ssao);
if (v3d->fx_settings.dof)
}
if (v3d->fx_settings.dof) {
writestruct(wd, DATA, "GPUDOFSettings", 1, v3d->fx_settings.dof);
}
}
else if (sl->spacetype==SPACE_IPO) {
SpaceIpo *sipo= (SpaceIpo *)sl;
else if (sl->spacetype == SPACE_IPO) {
SpaceIpo *sipo = (SpaceIpo *)sl;
ListBase tmpGhosts = sipo->ghostCurves;
/* temporarily disable ghost curves when saving */
sipo->ghostCurves.first= sipo->ghostCurves.last= NULL;
sipo->ghostCurves.first = sipo->ghostCurves.last = NULL;
writestruct(wd, DATA, "SpaceIpo", 1, sl);
if (sipo->ads) writestruct(wd, DATA, "bDopeSheet", 1, sipo->ads);
if (sipo->ads) {
writestruct(wd, DATA, "bDopeSheet", 1, sipo->ads);
}
/* reenable ghost curves */
sipo->ghostCurves= tmpGhosts;
sipo->ghostCurves = tmpGhosts;
}
else if (sl->spacetype==SPACE_BUTS) {
else if (sl->spacetype == SPACE_BUTS) {
writestruct(wd, DATA, "SpaceButs", 1, sl);
}
else if (sl->spacetype==SPACE_FILE) {
SpaceFile *sfile= (SpaceFile *)sl;
else if (sl->spacetype == SPACE_FILE) {
SpaceFile *sfile = (SpaceFile *)sl;
writestruct(wd, DATA, "SpaceFile", 1, sl);
if (sfile->params)
if (sfile->params) {
writestruct(wd, DATA, "FileSelectParams", 1, sfile->params);
}
}
else if (sl->spacetype==SPACE_SEQ) {
else if (sl->spacetype == SPACE_SEQ) {
writestruct(wd, DATA, "SpaceSeq", 1, sl);
}
else if (sl->spacetype==SPACE_OUTLINER) {
SpaceOops *so= (SpaceOops *)sl;
else if (sl->spacetype == SPACE_OUTLINER) {
SpaceOops *so = (SpaceOops *)sl;
write_soops(wd, so, &tmp_mem_list);
}
else if (sl->spacetype==SPACE_IMAGE) {
else if (sl->spacetype == SPACE_IMAGE) {
writestruct(wd, DATA, "SpaceImage", 1, sl);
}
else if (sl->spacetype==SPACE_TEXT) {
else if (sl->spacetype == SPACE_TEXT) {
writestruct(wd, DATA, "SpaceText", 1, sl);
}
else if (sl->spacetype==SPACE_SCRIPT) {
SpaceScript *scr = (SpaceScript*)sl;
else if (sl->spacetype == SPACE_SCRIPT) {
SpaceScript *scr = (SpaceScript *)sl;
scr->but_refs = NULL;
writestruct(wd, DATA, "SpaceScript", 1, sl);
}
else if (sl->spacetype==SPACE_ACTION) {
else if (sl->spacetype == SPACE_ACTION) {
writestruct(wd, DATA, "SpaceAction", 1, sl);
}
else if (sl->spacetype==SPACE_NLA) {
SpaceNla *snla= (SpaceNla *)sl;
else if (sl->spacetype == SPACE_NLA) {
SpaceNla *snla = (SpaceNla *)sl;
writestruct(wd, DATA, "SpaceNla", 1, snla);
if (snla->ads) writestruct(wd, DATA, "bDopeSheet", 1, snla->ads);
if (snla->ads) {
writestruct(wd, DATA, "bDopeSheet", 1, snla->ads);
}
}
else if (sl->spacetype==SPACE_TIME) {
else if (sl->spacetype == SPACE_TIME) {
writestruct(wd, DATA, "SpaceTime", 1, sl);
}
else if (sl->spacetype==SPACE_NODE) {
else if (sl->spacetype == SPACE_NODE) {
SpaceNode *snode = (SpaceNode *)sl;
bNodeTreePath *path;
writestruct(wd, DATA, "SpaceNode", 1, snode);
for (path=snode->treepath.first; path; path=path->next)
for (path = snode->treepath.first; path; path = path->next) {
writestruct(wd, DATA, "bNodeTreePath", 1, path);
}
}
else if (sl->spacetype==SPACE_LOGIC) {
else if (sl->spacetype == SPACE_LOGIC) {
writestruct(wd, DATA, "SpaceLogic", 1, sl);
}
else if (sl->spacetype==SPACE_CONSOLE) {
SpaceConsole *con = (SpaceConsole*)sl;
else if (sl->spacetype == SPACE_CONSOLE) {
SpaceConsole *con = (SpaceConsole *)sl;
ConsoleLine *cl;
for (cl=con->history.first; cl; cl=cl->next) {
for (cl = con->history.first; cl; cl = cl->next) {
/* 'len_alloc' is invalid on write, set from 'len' on read */
writestruct(wd, DATA, "ConsoleLine", 1, cl);
writedata(wd, DATA, cl->len+1, cl->line);
writedata(wd, DATA, cl->len + 1, cl->line);
}
writestruct(wd, DATA, "SpaceConsole", 1, sl);
}
else if (sl->spacetype==SPACE_USERPREF) {
else if (sl->spacetype == SPACE_USERPREF) {
writestruct(wd, DATA, "SpaceUserPref", 1, sl);
}
else if (sl->spacetype==SPACE_CLIP) {
else if (sl->spacetype == SPACE_CLIP) {
writestruct(wd, DATA, "SpaceClip", 1, sl);
}
else if (sl->spacetype == SPACE_INFO) {
writestruct(wd, DATA, "SpaceInfo", 1, sl);
}
sl= sl->next;
sl = sl->next;
}
}
sc= sc->id.next;
sc = sc->id.next;
}
BLI_linklist_freeN(tmp_mem_list);
/* flush helps the compression for undo-save */
mywrite(wd, MYWRITE_FLUSH, 0);
}
static void write_bone(WriteData *wd, Bone *bone)
{
Bone* cbone;
// PATCH for upward compatibility after 2.37+ armature recode
/* PATCH for upward compatibility after 2.37+ armature recode */
bone->size[0] = bone->size[1] = bone->size[2] = 1.0f;
// Write this bone
/* Write this bone */
writestruct(wd, DATA, "Bone", 1, bone);
/* Write ID Properties -- and copy this comment EXACTLY for easy finding
* of library blocks that implement this.*/
if (bone->prop)
if (bone->prop) {
IDP_WriteProperty(bone->prop, wd);
// Write Children
cbone= bone->childbase.first;
while (cbone) {
}
/* Write Children */
for (Bone *cbone = bone->childbase.first; cbone; cbone = cbone->next) {
write_bone(wd, cbone);
cbone= cbone->next;
}
}
static void write_armatures(WriteData *wd, ListBase *idbase)
{
bArmature *arm;
Bone *bone;
bArmature *arm;
Bone *bone;
arm=idbase->first;
arm = idbase->first;
while (arm) {
if (arm->id.us>0 || wd->current) {
if (arm->id.us > 0 || wd->current) {
writestruct(wd, ID_AR, "bArmature", 1, arm);
write_iddata(wd, &arm->id);
if (arm->adt) write_animdata(wd, arm->adt);
if (arm->adt) {
write_animdata(wd, arm->adt);
}
/* Direct data */
bone= arm->bonebase.first;
bone = arm->bonebase.first;
while (bone) {
write_bone(wd, bone);
bone=bone->next;
bone = bone->next;
}
}
arm=arm->id.next;
arm = arm->id.next;
}
/* flush helps the compression for undo-save */
@@ -2935,33 +3139,37 @@ static void write_texts(WriteData *wd, ListBase *idbase)
Text *text;
TextLine *tmp;
text= idbase->first;
text = idbase->first;
while (text) {
if ( (text->flags & TXT_ISMEM) && (text->flags & TXT_ISEXT)) text->flags &= ~TXT_ISEXT;
if ( (text->flags & TXT_ISMEM) && (text->flags & TXT_ISEXT)) {
text->flags &= ~TXT_ISEXT;
}
/* write LibData */
writestruct(wd, ID_TXT, "Text", 1, text);
write_iddata(wd, &text->id);
if (text->name) writedata(wd, DATA, strlen(text->name)+1, text->name);
if (text->name) {
writedata(wd, DATA, strlen(text->name) + 1, text->name);
}
if (!(text->flags & TXT_ISEXT)) {
/* now write the text data, in two steps for optimization in the readfunction */
tmp= text->lines.first;
tmp = text->lines.first;
while (tmp) {
writestruct(wd, DATA, "TextLine", 1, tmp);
tmp= tmp->next;
tmp = tmp->next;
}
tmp= text->lines.first;
tmp = text->lines.first;
while (tmp) {
writedata(wd, DATA, tmp->len+1, tmp->line);
tmp= tmp->next;
writedata(wd, DATA, tmp->len + 1, tmp->line);
tmp = tmp->next;
}
}
text= text->id.next;
text = text->id.next;
}
/* flush helps the compression for undo-save */
@@ -2972,16 +3180,18 @@ static void write_speakers(WriteData *wd, ListBase *idbase)
{
Speaker *spk;
spk= idbase->first;
spk = idbase->first;
while (spk) {
if (spk->id.us>0 || wd->current) {
if (spk->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_SPK, "Speaker", 1, spk);
write_iddata(wd, &spk->id);
if (spk->adt) write_animdata(wd, spk->adt);
if (spk->adt) {
write_animdata(wd, spk->adt);
}
}
spk= spk->id.next;
spk = spk->id.next;
}
}
@@ -2989,11 +3199,11 @@ static void write_sounds(WriteData *wd, ListBase *idbase)
{
bSound *sound;
PackedFile * pf;
PackedFile *pf;
sound= idbase->first;
sound = idbase->first;
while (sound) {
if (sound->id.us>0 || wd->current) {
if (sound->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_SO, "bSound", 1, sound);
write_iddata(wd, &sound->id);
@@ -3004,7 +3214,7 @@ static void write_sounds(WriteData *wd, ListBase *idbase)
writedata(wd, DATA, pf->size, pf->data);
}
}
sound= sound->id.next;
sound = sound->id.next;
}
/* flush helps the compression for undo-save */
@@ -3016,18 +3226,18 @@ static void write_groups(WriteData *wd, ListBase *idbase)
Group *group;
GroupObject *go;
for (group= idbase->first; group; group= group->id.next) {
if (group->id.us>0 || wd->current) {
for (group = idbase->first; group; group = group->id.next) {
if (group->id.us > 0 || wd->current) {
/* write LibData */
writestruct(wd, ID_GR, "Group", 1, group);
write_iddata(wd, &group->id);
write_previews(wd, group->preview);
go= group->gobject.first;
go = group->gobject.first;
while (go) {
writestruct(wd, DATA, "GroupObject", 1, go);
go= go->next;
go = go->next;
}
}
}
@@ -3036,9 +3246,9 @@ static void write_groups(WriteData *wd, ListBase *idbase)
static void write_nodetrees(WriteData *wd, ListBase *idbase)
{
bNodeTree *ntree;
for (ntree=idbase->first; ntree; ntree= ntree->id.next) {
if (ntree->id.us>0 || wd->current) {
for (ntree = idbase->first; ntree; ntree = ntree->id.next) {
if (ntree->id.us > 0 || wd->current) {
writestruct(wd, ID_NT, "bNodeTree", 1, ntree);
/* Note that trees directly used by other IDs (materials etc.) are not 'real' ID, they cannot
* be linked, etc., so we write actual id data here only, for 'real' ID trees. */
@@ -3054,11 +3264,12 @@ static void customnodes_add_deprecated_data(Main *mainvar)
{
FOREACH_NODETREE(mainvar, ntree, id) {
bNodeLink *link, *last_link = ntree->links.last;
/* only do this for node groups */
if (id != &ntree->id)
if (id != &ntree->id) {
continue;
}
/* Forward compatibility for group nodes: add links to node tree interface sockets.
* These links are invalid by new rules (missing node pointer)!
* They will be removed again in customnodes_free_deprecated_data,
@@ -3069,7 +3280,7 @@ static void customnodes_add_deprecated_data(Main *mainvar)
for (link = ntree->links.first; link; link = link->next) {
bNode *fromnode = link->fromnode, *tonode = link->tonode;
bNodeSocket *fromsock = link->fromsock, *tosock = link->tosock;
/* check both sides of the link, to handle direct input-to-output links */
if (fromnode->type == NODE_GROUP_INPUT) {
fromnode = NULL;
@@ -3080,22 +3291,23 @@ static void customnodes_add_deprecated_data(Main *mainvar)
tonode = NULL;
tosock = ntreeFindSocketInterface(ntree, SOCK_OUT, tosock->identifier);
}
if (!fromnode || !tonode) {
/* Note: not using nodeAddLink here, it asserts existing node pointers */
bNodeLink *tlink = MEM_callocN(sizeof(bNodeLink), "group node link");
tlink->fromnode = fromnode;
tlink->fromsock = fromsock;
tlink->tonode = tonode;
tlink->tosock= tosock;
tlink->tosock = tosock;
tosock->link = tlink;
tlink->flag |= NODE_LINK_VALID;
BLI_addtail(&ntree->links, tlink);
}
/* don't check newly created compatibility links */
if (link == last_link)
if (link == last_link) {
break;
}
}
}
FOREACH_NODETREE_END
@@ -3105,11 +3317,12 @@ static void customnodes_free_deprecated_data(Main *mainvar)
{
FOREACH_NODETREE(mainvar, ntree, id) {
bNodeLink *link, *next_link;
for (link = ntree->links.first; link; link = next_link) {
next_link = link->next;
if (link->fromnode == NULL || link->tonode == NULL)
if (link->fromnode == NULL || link->tonode == NULL) {
nodeRemLink(ntree, link);
}
}
}
FOREACH_NODETREE_END
@@ -3119,16 +3332,18 @@ static void customnodes_free_deprecated_data(Main *mainvar)
static void write_brushes(WriteData *wd, ListBase *idbase)
{
Brush *brush;
for (brush=idbase->first; brush; brush= brush->id.next) {
if (brush->id.us>0 || wd->current) {
for (brush = idbase->first; brush; brush = brush->id.next) {
if (brush->id.us > 0 || wd->current) {
writestruct(wd, ID_BR, "Brush", 1, brush);
write_iddata(wd, &brush->id);
if (brush->curve)
if (brush->curve) {
write_curvemapping(wd, brush->curve);
if (brush->gradient)
}
if (brush->gradient) {
writestruct(wd, DATA, "ColorBand", 1, brush->gradient);
}
}
}
}
@@ -3143,8 +3358,9 @@ static void write_palettes(WriteData *wd, ListBase *idbase)
writestruct(wd, ID_PAL, "Palette", 1, palette);
write_iddata(wd, &palette->id);
for (color = palette->colors.first; color; color= color->next)
for (color = palette->colors.first; color; color = color->next) {
writestruct(wd, DATA, "PaletteColor", 1, color);
}
}
}
}
@@ -3167,14 +3383,15 @@ static void write_movieTracks(WriteData *wd, ListBase *tracks)
{
MovieTrackingTrack *track;
track= tracks->first;
track = tracks->first;
while (track) {
writestruct(wd, DATA, "MovieTrackingTrack", 1, track);
if (track->markers)
if (track->markers) {
writestruct(wd, DATA, "MovieTrackingMarker", track->markersnr, track->markers);
}
track= track->next;
track = track->next;
}
}
@@ -3195,31 +3412,33 @@ static void write_moviePlaneTracks(WriteData *wd, ListBase *plane_tracks_base)
static void write_movieReconstruction(WriteData *wd, MovieTrackingReconstruction *reconstruction)
{
if (reconstruction->camnr)
if (reconstruction->camnr) {
writestruct(wd, DATA, "MovieReconstructedCamera", reconstruction->camnr, reconstruction->cameras);
}
}
static void write_movieclips(WriteData *wd, ListBase *idbase)
{
MovieClip *clip;
clip= idbase->first;
clip = idbase->first;
while (clip) {
if (clip->id.us>0 || wd->current) {
MovieTracking *tracking= &clip->tracking;
if (clip->id.us > 0 || wd->current) {
MovieTracking *tracking = &clip->tracking;
MovieTrackingObject *object;
writestruct(wd, ID_MC, "MovieClip", 1, clip);
write_iddata(wd, &clip->id);
if (clip->adt)
if (clip->adt) {
write_animdata(wd, clip->adt);
}
write_movieTracks(wd, &tracking->tracks);
write_moviePlaneTracks(wd, &tracking->plane_tracks);
write_movieReconstruction(wd, &tracking->reconstruction);
object= tracking->objects.first;
object = tracking->objects.first;
while (object) {
writestruct(wd, DATA, "MovieTrackingObject", 1, object);
@@ -3227,11 +3446,11 @@ static void write_movieclips(WriteData *wd, ListBase *idbase)
write_moviePlaneTracks(wd, &object->plane_tracks);
write_movieReconstruction(wd, &object->reconstruction);
object= object->next;
object = object->next;
}
}
clip= clip->id.next;
clip = clip->id.next;
}
/* flush helps the compression for undo-save */
@@ -3250,8 +3469,9 @@ static void write_masks(WriteData *wd, ListBase *idbase)
writestruct(wd, ID_MSK, "Mask", 1, mask);
write_iddata(wd, &mask->id);
if (mask->adt)
if (mask->adt) {
write_animdata(wd, mask->adt);
}
for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
MaskSpline *spline;
@@ -3273,14 +3493,20 @@ static void write_masks(WriteData *wd, ListBase *idbase)
for (i = 0; i < spline->tot_point; i++) {
MaskSplinePoint *point = &spline->points[i];
if (point->tot_uw)
if (point->tot_uw) {
writestruct(wd, DATA, "MaskSplinePointUW", point->tot_uw, point->uw);
}
}
}
for (masklay_shape = masklay->splines_shapes.first; masklay_shape; masklay_shape = masklay_shape->next) {
for (masklay_shape = masklay->splines_shapes.first;
masklay_shape;
masklay_shape = masklay_shape->next)
{
writestruct(wd, DATA, "MaskLayerShape", 1, masklay_shape);
writedata(wd, DATA, masklay_shape->tot_vert * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE, masklay_shape->data);
writedata(wd, DATA,
masklay_shape->tot_vert * sizeof(float) * MASK_OBJECT_SHAPE_ELEM_SIZE,
masklay_shape->data);
}
}
}
@@ -3299,61 +3525,61 @@ static void write_linestyle_color_modifiers(WriteData *wd, ListBase *modifiers)
for (m = modifiers->first; m; m = m->next) {
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
struct_name = "LineStyleColorModifier_AlongStroke";
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
struct_name = "LineStyleColorModifier_DistanceFromCamera";
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
struct_name = "LineStyleColorModifier_DistanceFromObject";
break;
case LS_MODIFIER_MATERIAL:
struct_name = "LineStyleColorModifier_Material";
break;
case LS_MODIFIER_TANGENT:
struct_name = "LineStyleColorModifier_Tangent";
break;
case LS_MODIFIER_NOISE:
struct_name = "LineStyleColorModifier_Noise";
break;
case LS_MODIFIER_CREASE_ANGLE:
struct_name = "LineStyleColorModifier_CreaseAngle";
break;
case LS_MODIFIER_CURVATURE_3D:
struct_name = "LineStyleColorModifier_Curvature_3D";
break;
default:
struct_name = "LineStyleColorModifier"; /* this should not happen */
case LS_MODIFIER_ALONG_STROKE:
struct_name = "LineStyleColorModifier_AlongStroke";
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
struct_name = "LineStyleColorModifier_DistanceFromCamera";
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
struct_name = "LineStyleColorModifier_DistanceFromObject";
break;
case LS_MODIFIER_MATERIAL:
struct_name = "LineStyleColorModifier_Material";
break;
case LS_MODIFIER_TANGENT:
struct_name = "LineStyleColorModifier_Tangent";
break;
case LS_MODIFIER_NOISE:
struct_name = "LineStyleColorModifier_Noise";
break;
case LS_MODIFIER_CREASE_ANGLE:
struct_name = "LineStyleColorModifier_CreaseAngle";
break;
case LS_MODIFIER_CURVATURE_3D:
struct_name = "LineStyleColorModifier_Curvature_3D";
break;
default:
struct_name = "LineStyleColorModifier"; /* this should not happen */
}
writestruct(wd, DATA, struct_name, 1, m);
}
for (m = modifiers->first; m; m = m->next) {
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_AlongStroke *)m)->color_ramp);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp);
break;
case LS_MODIFIER_MATERIAL:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_Material *)m)->color_ramp);
break;
case LS_MODIFIER_TANGENT:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_Tangent *)m)->color_ramp);
break;
case LS_MODIFIER_NOISE:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_Noise *)m)->color_ramp);
break;
case LS_MODIFIER_CREASE_ANGLE:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_CreaseAngle *)m)->color_ramp);
break;
case LS_MODIFIER_CURVATURE_3D:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_Curvature_3D *)m)->color_ramp);
break;
case LS_MODIFIER_ALONG_STROKE:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_AlongStroke *)m)->color_ramp);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp);
break;
case LS_MODIFIER_MATERIAL:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_Material *)m)->color_ramp);
break;
case LS_MODIFIER_TANGENT:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_Tangent *)m)->color_ramp);
break;
case LS_MODIFIER_NOISE:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_Noise *)m)->color_ramp);
break;
case LS_MODIFIER_CREASE_ANGLE:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_CreaseAngle *)m)->color_ramp);
break;
case LS_MODIFIER_CURVATURE_3D:
writestruct(wd, DATA, "ColorBand", 1, ((LineStyleColorModifier_Curvature_3D *)m)->color_ramp);
break;
}
}
}
@@ -3365,61 +3591,61 @@ static void write_linestyle_alpha_modifiers(WriteData *wd, ListBase *modifiers)
for (m = modifiers->first; m; m = m->next) {
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
struct_name = "LineStyleAlphaModifier_AlongStroke";
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
struct_name = "LineStyleAlphaModifier_DistanceFromCamera";
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
struct_name = "LineStyleAlphaModifier_DistanceFromObject";
break;
case LS_MODIFIER_MATERIAL:
struct_name = "LineStyleAlphaModifier_Material";
break;
case LS_MODIFIER_TANGENT:
struct_name = "LineStyleAlphaModifier_Tangent";
break;
case LS_MODIFIER_NOISE:
struct_name = "LineStyleAlphaModifier_Noise";
break;
case LS_MODIFIER_CREASE_ANGLE:
struct_name = "LineStyleAlphaModifier_CreaseAngle";
break;
case LS_MODIFIER_CURVATURE_3D:
struct_name = "LineStyleAlphaModifier_Curvature_3D";
break;
default:
struct_name = "LineStyleAlphaModifier"; /* this should not happen */
case LS_MODIFIER_ALONG_STROKE:
struct_name = "LineStyleAlphaModifier_AlongStroke";
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
struct_name = "LineStyleAlphaModifier_DistanceFromCamera";
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
struct_name = "LineStyleAlphaModifier_DistanceFromObject";
break;
case LS_MODIFIER_MATERIAL:
struct_name = "LineStyleAlphaModifier_Material";
break;
case LS_MODIFIER_TANGENT:
struct_name = "LineStyleAlphaModifier_Tangent";
break;
case LS_MODIFIER_NOISE:
struct_name = "LineStyleAlphaModifier_Noise";
break;
case LS_MODIFIER_CREASE_ANGLE:
struct_name = "LineStyleAlphaModifier_CreaseAngle";
break;
case LS_MODIFIER_CURVATURE_3D:
struct_name = "LineStyleAlphaModifier_Curvature_3D";
break;
default:
struct_name = "LineStyleAlphaModifier"; /* this should not happen */
}
writestruct(wd, DATA, struct_name, 1, m);
}
for (m = modifiers->first; m; m = m->next) {
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
write_curvemapping(wd, ((LineStyleAlphaModifier_AlongStroke *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
write_curvemapping(wd, ((LineStyleAlphaModifier_DistanceFromCamera *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
write_curvemapping(wd, ((LineStyleAlphaModifier_DistanceFromObject *)m)->curve);
break;
case LS_MODIFIER_MATERIAL:
write_curvemapping(wd, ((LineStyleAlphaModifier_Material *)m)->curve);
break;
case LS_MODIFIER_TANGENT:
write_curvemapping(wd, ((LineStyleAlphaModifier_Tangent *)m)->curve);
break;
case LS_MODIFIER_NOISE:
write_curvemapping(wd, ((LineStyleAlphaModifier_Noise *)m)->curve);
break;
case LS_MODIFIER_CREASE_ANGLE:
write_curvemapping(wd, ((LineStyleAlphaModifier_CreaseAngle *)m)->curve);
break;
case LS_MODIFIER_CURVATURE_3D:
write_curvemapping(wd, ((LineStyleAlphaModifier_Curvature_3D *)m)->curve);
break;
case LS_MODIFIER_ALONG_STROKE:
write_curvemapping(wd, ((LineStyleAlphaModifier_AlongStroke *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
write_curvemapping(wd, ((LineStyleAlphaModifier_DistanceFromCamera *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
write_curvemapping(wd, ((LineStyleAlphaModifier_DistanceFromObject *)m)->curve);
break;
case LS_MODIFIER_MATERIAL:
write_curvemapping(wd, ((LineStyleAlphaModifier_Material *)m)->curve);
break;
case LS_MODIFIER_TANGENT:
write_curvemapping(wd, ((LineStyleAlphaModifier_Tangent *)m)->curve);
break;
case LS_MODIFIER_NOISE:
write_curvemapping(wd, ((LineStyleAlphaModifier_Noise *)m)->curve);
break;
case LS_MODIFIER_CREASE_ANGLE:
write_curvemapping(wd, ((LineStyleAlphaModifier_CreaseAngle *)m)->curve);
break;
case LS_MODIFIER_CURVATURE_3D:
write_curvemapping(wd, ((LineStyleAlphaModifier_Curvature_3D *)m)->curve);
break;
}
}
}
@@ -3431,61 +3657,61 @@ static void write_linestyle_thickness_modifiers(WriteData *wd, ListBase *modifie
for (m = modifiers->first; m; m = m->next) {
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
struct_name = "LineStyleThicknessModifier_AlongStroke";
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
struct_name = "LineStyleThicknessModifier_DistanceFromCamera";
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
struct_name = "LineStyleThicknessModifier_DistanceFromObject";
break;
case LS_MODIFIER_MATERIAL:
struct_name = "LineStyleThicknessModifier_Material";
break;
case LS_MODIFIER_CALLIGRAPHY:
struct_name = "LineStyleThicknessModifier_Calligraphy";
break;
case LS_MODIFIER_TANGENT:
struct_name = "LineStyleThicknessModifier_Tangent";
break;
case LS_MODIFIER_NOISE:
struct_name = "LineStyleThicknessModifier_Noise";
break;
case LS_MODIFIER_CREASE_ANGLE:
struct_name = "LineStyleThicknessModifier_CreaseAngle";
break;
case LS_MODIFIER_CURVATURE_3D:
struct_name = "LineStyleThicknessModifier_Curvature_3D";
break;
default:
struct_name = "LineStyleThicknessModifier"; /* this should not happen */
case LS_MODIFIER_ALONG_STROKE:
struct_name = "LineStyleThicknessModifier_AlongStroke";
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
struct_name = "LineStyleThicknessModifier_DistanceFromCamera";
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
struct_name = "LineStyleThicknessModifier_DistanceFromObject";
break;
case LS_MODIFIER_MATERIAL:
struct_name = "LineStyleThicknessModifier_Material";
break;
case LS_MODIFIER_CALLIGRAPHY:
struct_name = "LineStyleThicknessModifier_Calligraphy";
break;
case LS_MODIFIER_TANGENT:
struct_name = "LineStyleThicknessModifier_Tangent";
break;
case LS_MODIFIER_NOISE:
struct_name = "LineStyleThicknessModifier_Noise";
break;
case LS_MODIFIER_CREASE_ANGLE:
struct_name = "LineStyleThicknessModifier_CreaseAngle";
break;
case LS_MODIFIER_CURVATURE_3D:
struct_name = "LineStyleThicknessModifier_Curvature_3D";
break;
default:
struct_name = "LineStyleThicknessModifier"; /* this should not happen */
}
writestruct(wd, DATA, struct_name, 1, m);
}
for (m = modifiers->first; m; m = m->next) {
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
write_curvemapping(wd, ((LineStyleThicknessModifier_AlongStroke *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
write_curvemapping(wd, ((LineStyleThicknessModifier_DistanceFromCamera *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
write_curvemapping(wd, ((LineStyleThicknessModifier_DistanceFromObject *)m)->curve);
break;
case LS_MODIFIER_MATERIAL:
write_curvemapping(wd, ((LineStyleThicknessModifier_Material *)m)->curve);
break;
case LS_MODIFIER_TANGENT:
write_curvemapping(wd, ((LineStyleThicknessModifier_Tangent *)m)->curve);
break;
case LS_MODIFIER_CREASE_ANGLE:
write_curvemapping(wd, ((LineStyleThicknessModifier_CreaseAngle *)m)->curve);
break;
case LS_MODIFIER_CURVATURE_3D:
write_curvemapping(wd, ((LineStyleThicknessModifier_Curvature_3D *)m)->curve);
break;
case LS_MODIFIER_ALONG_STROKE:
write_curvemapping(wd, ((LineStyleThicknessModifier_AlongStroke *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
write_curvemapping(wd, ((LineStyleThicknessModifier_DistanceFromCamera *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
write_curvemapping(wd, ((LineStyleThicknessModifier_DistanceFromObject *)m)->curve);
break;
case LS_MODIFIER_MATERIAL:
write_curvemapping(wd, ((LineStyleThicknessModifier_Material *)m)->curve);
break;
case LS_MODIFIER_TANGENT:
write_curvemapping(wd, ((LineStyleThicknessModifier_Tangent *)m)->curve);
break;
case LS_MODIFIER_CREASE_ANGLE:
write_curvemapping(wd, ((LineStyleThicknessModifier_CreaseAngle *)m)->curve);
break;
case LS_MODIFIER_CURVATURE_3D:
write_curvemapping(wd, ((LineStyleThicknessModifier_Curvature_3D *)m)->curve);
break;
}
}
}
@@ -3497,50 +3723,50 @@ static void write_linestyle_geometry_modifiers(WriteData *wd, ListBase *modifier
for (m = modifiers->first; m; m = m->next) {
switch (m->type) {
case LS_MODIFIER_SAMPLING:
struct_name = "LineStyleGeometryModifier_Sampling";
break;
case LS_MODIFIER_BEZIER_CURVE:
struct_name = "LineStyleGeometryModifier_BezierCurve";
break;
case LS_MODIFIER_SINUS_DISPLACEMENT:
struct_name = "LineStyleGeometryModifier_SinusDisplacement";
break;
case LS_MODIFIER_SPATIAL_NOISE:
struct_name = "LineStyleGeometryModifier_SpatialNoise";
break;
case LS_MODIFIER_PERLIN_NOISE_1D:
struct_name = "LineStyleGeometryModifier_PerlinNoise1D";
break;
case LS_MODIFIER_PERLIN_NOISE_2D:
struct_name = "LineStyleGeometryModifier_PerlinNoise2D";
break;
case LS_MODIFIER_BACKBONE_STRETCHER:
struct_name = "LineStyleGeometryModifier_BackboneStretcher";
break;
case LS_MODIFIER_TIP_REMOVER:
struct_name = "LineStyleGeometryModifier_TipRemover";
break;
case LS_MODIFIER_POLYGONIZATION:
struct_name = "LineStyleGeometryModifier_Polygonalization";
break;
case LS_MODIFIER_GUIDING_LINES:
struct_name = "LineStyleGeometryModifier_GuidingLines";
break;
case LS_MODIFIER_BLUEPRINT:
struct_name = "LineStyleGeometryModifier_Blueprint";
break;
case LS_MODIFIER_2D_OFFSET:
struct_name = "LineStyleGeometryModifier_2DOffset";
break;
case LS_MODIFIER_2D_TRANSFORM:
struct_name = "LineStyleGeometryModifier_2DTransform";
break;
case LS_MODIFIER_SIMPLIFICATION:
struct_name = "LineStyleGeometryModifier_Simplification";
break;
default:
struct_name = "LineStyleGeometryModifier"; /* this should not happen */
case LS_MODIFIER_SAMPLING:
struct_name = "LineStyleGeometryModifier_Sampling";
break;
case LS_MODIFIER_BEZIER_CURVE:
struct_name = "LineStyleGeometryModifier_BezierCurve";
break;
case LS_MODIFIER_SINUS_DISPLACEMENT:
struct_name = "LineStyleGeometryModifier_SinusDisplacement";
break;
case LS_MODIFIER_SPATIAL_NOISE:
struct_name = "LineStyleGeometryModifier_SpatialNoise";
break;
case LS_MODIFIER_PERLIN_NOISE_1D:
struct_name = "LineStyleGeometryModifier_PerlinNoise1D";
break;
case LS_MODIFIER_PERLIN_NOISE_2D:
struct_name = "LineStyleGeometryModifier_PerlinNoise2D";
break;
case LS_MODIFIER_BACKBONE_STRETCHER:
struct_name = "LineStyleGeometryModifier_BackboneStretcher";
break;
case LS_MODIFIER_TIP_REMOVER:
struct_name = "LineStyleGeometryModifier_TipRemover";
break;
case LS_MODIFIER_POLYGONIZATION:
struct_name = "LineStyleGeometryModifier_Polygonalization";
break;
case LS_MODIFIER_GUIDING_LINES:
struct_name = "LineStyleGeometryModifier_GuidingLines";
break;
case LS_MODIFIER_BLUEPRINT:
struct_name = "LineStyleGeometryModifier_Blueprint";
break;
case LS_MODIFIER_2D_OFFSET:
struct_name = "LineStyleGeometryModifier_2DOffset";
break;
case LS_MODIFIER_2D_TRANSFORM:
struct_name = "LineStyleGeometryModifier_2DTransform";
break;
case LS_MODIFIER_SIMPLIFICATION:
struct_name = "LineStyleGeometryModifier_Simplification";
break;
default:
struct_name = "LineStyleGeometryModifier"; /* this should not happen */
}
writestruct(wd, DATA, struct_name, 1, m);
}
@@ -3552,18 +3778,22 @@ static void write_linestyles(WriteData *wd, ListBase *idbase)
int a;
for (linestyle = idbase->first; linestyle; linestyle = linestyle->id.next) {
if (linestyle->id.us>0 || wd->current) {
if (linestyle->id.us > 0 || wd->current) {
writestruct(wd, ID_LS, "FreestyleLineStyle", 1, linestyle);
write_iddata(wd, &linestyle->id);
if (linestyle->adt)
if (linestyle->adt) {
write_animdata(wd, linestyle->adt);
}
write_linestyle_color_modifiers(wd, &linestyle->color_modifiers);
write_linestyle_alpha_modifiers(wd, &linestyle->alpha_modifiers);
write_linestyle_thickness_modifiers(wd, &linestyle->thickness_modifiers);
write_linestyle_geometry_modifiers(wd, &linestyle->geometry_modifiers);
for (a=0; a<MAX_MTEX; a++) {
if (linestyle->mtex[a]) writestruct(wd, DATA, "MTex", 1, linestyle->mtex[a]);
for (a = 0; a < MAX_MTEX; a++) {
if (linestyle->mtex[a]) {
writestruct(wd, DATA, "MTex", 1, linestyle->mtex[a]);
}
}
if (linestyle->nodetree) {
writestruct(wd, DATA, "bNodeTree", 1, linestyle->nodetree);
@@ -3581,23 +3811,26 @@ static void write_libraries(WriteData *wd, Main *main)
int a, tot;
bool found_one;
for (; main; main= main->next) {
for (; main; main = main->next) {
a=tot= set_listbasepointers(main, lbarray);
a = tot = set_listbasepointers(main, lbarray);
/* test: is lib being used */
if (main->curlib && main->curlib->packedfile)
if (main->curlib && main->curlib->packedfile) {
found_one = true;
}
else {
found_one = false;
while (tot--) {
for (id= lbarray[tot]->first; id; id= id->next) {
for (id = lbarray[tot]->first; id; id = id->next) {
if (id->us > 0 && (id->tag & LIB_TAG_EXTERN)) {
found_one = true;
break;
}
}
if (found_one) break;
if (found_one) {
break;
}
}
}
@@ -3612,12 +3845,13 @@ static void write_libraries(WriteData *wd, Main *main)
PackedFile *pf = main->curlib->packedfile;
writestruct(wd, DATA, "PackedFile", 1, pf);
writedata(wd, DATA, pf->size, pf->data);
if (wd->current == NULL)
if (wd->current == NULL) {
printf("write packed .blend: %s\n", main->curlib->name);
}
}
while (a--) {
for (id= lbarray[a]->first; id; id= id->next) {
for (id = lbarray[a]->first; id; id = id->next) {
if (id->us > 0 && (id->tag & LIB_TAG_EXTERN)) {
if (!BKE_idcode_is_linkable(GS(id->name))) {
printf("ERROR: write file: datablock '%s' from lib '%s' is not linkable "
@@ -3641,7 +3875,7 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar)
FileGlobal fg;
bScreen *screen;
char subvstr[8];
/* prevent mem checkers from complaining */
memset(fg.pad, 0, sizeof(fg.pad));
memset(fg.filename, 0, sizeof(fg.filename));
@@ -3650,20 +3884,20 @@ static void write_global(WriteData *wd, int fileflags, Main *mainvar)
current_screen_compat(mainvar, &screen, is_undo);
/* XXX still remap G */
fg.curscreen= screen;
fg.curscene= screen ? screen->scene : NULL;
fg.curscreen = screen;
fg.curscene = screen ? screen->scene : NULL;
/* prevent to save this, is not good convention, and feature with concerns... */
fg.fileflags= (fileflags & ~G_FILE_FLAGS_RUNTIME);
fg.fileflags = (fileflags & ~G_FILE_FLAGS_RUNTIME);
fg.globalf= G.f;
fg.globalf = G.f;
BLI_strncpy(fg.filename, mainvar->name, sizeof(fg.filename));
sprintf(subvstr, "%4d", BLENDER_SUBVERSION);
memcpy(fg.subvstr, subvstr, 4);
fg.subversion= BLENDER_SUBVERSION;
fg.minversion= BLENDER_MINVERSION;
fg.minsubversion= BLENDER_MINSUBVERSION;
fg.subversion = BLENDER_SUBVERSION;
fg.minversion = BLENDER_MINVERSION;
fg.minsubversion = BLENDER_MINSUBVERSION;
#ifdef WITH_BUILDINFO
{
extern unsigned long build_commit_timestamp;
@@ -3730,42 +3964,42 @@ static int write_file_handle(
write_global(wd, write_flags, mainvar);
write_windowmanagers(wd, &mainvar->wm);
write_screens (wd, &mainvar->screen);
write_movieclips (wd, &mainvar->movieclip);
write_masks (wd, &mainvar->mask);
write_scenes (wd, &mainvar->scene);
write_curves (wd, &mainvar->curve);
write_mballs (wd, &mainvar->mball);
write_images (wd, &mainvar->image);
write_cameras (wd, &mainvar->camera);
write_lamps (wd, &mainvar->lamp);
write_lattices (wd, &mainvar->latt);
write_vfonts (wd, &mainvar->vfont);
write_keys (wd, &mainvar->key);
write_worlds (wd, &mainvar->world);
write_texts (wd, &mainvar->text);
write_speakers (wd, &mainvar->speaker);
write_sounds (wd, &mainvar->sound);
write_groups (wd, &mainvar->group);
write_screens(wd, &mainvar->screen);
write_movieclips(wd, &mainvar->movieclip);
write_masks(wd, &mainvar->mask);
write_scenes(wd, &mainvar->scene);
write_curves(wd, &mainvar->curve);
write_mballs(wd, &mainvar->mball);
write_images(wd, &mainvar->image);
write_cameras(wd, &mainvar->camera);
write_lamps(wd, &mainvar->lamp);
write_lattices(wd, &mainvar->latt);
write_vfonts(wd, &mainvar->vfont);
write_keys(wd, &mainvar->key);
write_worlds(wd, &mainvar->world);
write_texts(wd, &mainvar->text);
write_speakers(wd, &mainvar->speaker);
write_sounds(wd, &mainvar->sound);
write_groups(wd, &mainvar->group);
write_armatures(wd, &mainvar->armature);
write_actions (wd, &mainvar->action);
write_objects (wd, &mainvar->object);
write_actions(wd, &mainvar->action);
write_objects(wd, &mainvar->object);
write_materials(wd, &mainvar->mat);
write_textures (wd, &mainvar->tex);
write_meshes (wd, &mainvar->mesh);
write_textures(wd, &mainvar->tex);
write_meshes(wd, &mainvar->mesh);
write_particlesettings(wd, &mainvar->particle);
write_nodetrees(wd, &mainvar->nodetree);
write_brushes (wd, &mainvar->brush);
write_palettes (wd, &mainvar->palettes);
write_paintcurves (wd, &mainvar->paintcurves);
write_gpencils (wd, &mainvar->gpencil);
write_brushes(wd, &mainvar->brush);
write_palettes(wd, &mainvar->palettes);
write_paintcurves(wd, &mainvar->paintcurves);
write_gpencils(wd, &mainvar->gpencil);
write_linestyles(wd, &mainvar->linestyle);
write_libraries(wd, mainvar->next);
if (write_user_block) {
write_userdef(wd);
}
/* dna as last, because (to be implemented) test for which structs are written */
writedata(wd, DNA1, wd->sdna->datalen, wd->sdna->data);
@@ -3782,7 +4016,7 @@ static int write_file_handle(
/* end of file */
memset(&bhead, 0, sizeof(BHead));
bhead.code= ENDB;
bhead.code = ENDB;
mywrite(wd, &bhead, sizeof(BHead));
blo_join_main(&mainlist);
@@ -3795,16 +4029,19 @@ static int write_file_handle(
static bool do_history(const char *name, ReportList *reports)
{
char tempname1[FILE_MAX], tempname2[FILE_MAX];
int hisnr= U.versions;
if (U.versions==0) return 0;
if (strlen(name)<2) {
int hisnr = U.versions;
if (U.versions == 0) {
return 0;
}
if (strlen(name) < 2) {
BKE_report(reports, RPT_ERROR, "Unable to make version backup: filename too short");
return 1;
}
while (hisnr > 1) {
BLI_snprintf(tempname1, sizeof(tempname1), "%s%d", name, hisnr-1);
BLI_snprintf(tempname1, sizeof(tempname1), "%s%d", name, hisnr - 1);
if (BLI_exists(tempname1)) {
BLI_snprintf(tempname2, sizeof(tempname2), "%s%d", name, hisnr);
@@ -3836,7 +4073,7 @@ bool BLO_write_file(
Main *mainvar, const char *filepath, int write_flags,
ReportList *reports, const BlendThumbnail *thumb)
{
char tempname[FILE_MAX+1];
char tempname[FILE_MAX + 1];
int err, write_user_block;
eWriteWrapType ww_type;
WriteWrap ww;
@@ -3892,10 +4129,12 @@ bool BLO_write_file(
}
}
write_user_block= write_flags & G_FILE_USERPREFS;
write_user_block = write_flags & G_FILE_USERPREFS;
if (write_flags & G_FILE_RELATIVE_REMAP)
BKE_bpath_relative_convert(mainvar, filepath, NULL); /* note, making relative to something OTHER then G.main->name */
if (write_flags & G_FILE_RELATIVE_REMAP) {
/* note, making relative to something OTHER then G.main->name */
BKE_bpath_relative_convert(mainvar, filepath, NULL);
}
/* actual file writing */
err = write_file_handle(mainvar, &ww, NULL, NULL, write_user_block, write_flags, thumb);