Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/blenloader/intern/readfile.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r--source/blender/blenloader/intern/readfile.c239
1 files changed, 156 insertions, 83 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 9aa87a86b3e..4adcf6add2a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -1061,7 +1061,8 @@ void blo_freefiledata(FileData *fd)
close(fd->filedes);
}
- if (fd->gzfiledes != NULL) {
+ if (fd->gzfiledes != NULL)
+ {
gzclose(fd->gzfiledes);
}
@@ -2457,10 +2458,19 @@ typedef struct tConstraintLinkData {
ID *id;
} tConstraintLinkData;
/* callback function used to relink constraint ID-links */
-static void lib_link_constraint_cb(bConstraint *UNUSED(con), ID **idpoin, void *userdata)
+static void lib_link_constraint_cb(bConstraint *UNUSED(con), ID **idpoin, short isReference, void *userdata)
{
tConstraintLinkData *cld= (tConstraintLinkData *)userdata;
- *idpoin = newlibadr(cld->fd, cld->id->lib, *idpoin);
+
+ /* for reference types, we need to increment the usercounts on load... */
+ if (isReference) {
+ /* reference type - with usercount */
+ *idpoin = newlibadr_us(cld->fd, cld->id->lib, *idpoin);
+ }
+ else {
+ /* target type - no usercount needed */
+ *idpoin = newlibadr(cld->fd, cld->id->lib, *idpoin);
+ }
}
static void lib_link_constraints(FileData *fd, ID *id, ListBase *conlist)
@@ -2755,9 +2765,9 @@ static void switch_endian_keyblock(Key *key, KeyBlock *kb)
cp= key->elemstr;
poin= data;
- while ( cp[0] ) { /* cp[0] == amount */
+ while ( cp[0] ) { /* cp[0]==amount */
- switch (cp[1]) { /* cp[1] = type */
+ switch(cp[1]) { /* cp[1]= type */
case IPO_FLOAT:
case IPO_BPOINT:
case IPO_BEZTRIPLE:
@@ -3441,7 +3451,7 @@ static void lib_link_particlesettings(FileData *fd, Main *main)
for (; state; state=state->next) {
rule = state->rules.first;
for (; rule; rule=rule->next)
- switch (rule->type) {
+ switch(rule->type) {
case eBoidRuleType_Goal:
case eBoidRuleType_Avoid:
{
@@ -4234,7 +4244,8 @@ static void lib_link_object(FileData *fd, Main *main)
{
SmokeModifierData *smd = (SmokeModifierData *)modifiers_findByType(ob, eModifierType_Smoke);
- if (smd && smd->type == MOD_SMOKE_TYPE_DOMAIN && smd->domain) {
+ if (smd && smd->type == MOD_SMOKE_TYPE_DOMAIN && smd->domain)
+ {
smd->domain->flags |= MOD_SMOKE_FILE_LOAD; /* flag for refreshing the simulation after loading */
}
}
@@ -4357,7 +4368,8 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
else if (md->type==eModifierType_Smoke) {
SmokeModifierData *smd = (SmokeModifierData*) md;
- if (smd->type==MOD_SMOKE_TYPE_DOMAIN) {
+ if (smd->type==MOD_SMOKE_TYPE_DOMAIN)
+ {
smd->flow = NULL;
smd->coll = NULL;
smd->domain = newdataadr(fd, smd->domain);
@@ -4402,7 +4414,8 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
smd->flow = NULL;
smd->domain = NULL;
smd->coll = newdataadr(fd, smd->coll);
- if (smd->coll) {
+ if (smd->coll)
+ {
smd->coll->points = NULL;
smd->coll->numpoints = 0;
}
@@ -4414,7 +4427,8 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
else if (md->type==eModifierType_DynamicPaint) {
DynamicPaintModifierData *pmd = (DynamicPaintModifierData*) md;
- if (pmd->canvas) {
+ if (pmd->canvas)
+ {
pmd->canvas = newdataadr(fd, pmd->canvas);
pmd->canvas->pmd = pmd;
pmd->canvas->dm = NULL;
@@ -4434,7 +4448,8 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
}
}
}
- if (pmd->brush) {
+ if (pmd->brush)
+ {
pmd->brush = newdataadr(fd, pmd->brush);
pmd->brush->pmd = pmd;
pmd->brush->psys = newdataadr(fd, pmd->brush->psys);
@@ -4841,7 +4856,7 @@ static void lib_link_scene(FileData *fd, Main *main)
}
}
- SEQ_BEGIN (sce->ed, seq) {
+ SEQ_BEGIN(sce->ed, seq) {
if (seq->ipo) seq->ipo= newlibadr_us(fd, sce->id.lib, seq->ipo);
seq->scene_sound = NULL;
if (seq->scene) {
@@ -4972,7 +4987,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
/* recursive link sequences, lb will be correctly initialized */
link_recurs_seq(fd, &ed->seqbase);
- SEQ_BEGIN (ed, seq) {
+ SEQ_BEGIN(ed, seq) {
seq->seq1= newdataadr(fd, seq->seq1);
seq->seq2= newdataadr(fd, seq->seq2);
seq->seq3= newdataadr(fd, seq->seq3);
@@ -6083,7 +6098,8 @@ static void direct_link_sound(FileData *fd, bSound *sound)
sound->waveform = NULL;
// versioning stuff, if there was a cache, then we enable caching:
- if (sound->cache) {
+ if (sound->cache)
+ {
sound->flags |= SOUND_FLAGS_CACHING;
sound->cache = NULL;
}
@@ -6226,7 +6242,8 @@ static void lib_link_movieclip(FileData *fd, Main *main)
static const char *dataname(short id_code)
{
- switch ( id_code ) {
+
+ switch( id_code ) {
case ID_OB: return "Data from OB";
case ID_ME: return "Data from ME";
case ID_IP: return "Data from IP";
@@ -6336,7 +6353,7 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, int flag, ID
bhead= read_data_into_oldnewmap(fd, bhead, allocname);
/* init pointers direct data */
- switch (GS(id->name)) {
+ switch( GS(id->name) ) {
case ID_WM:
direct_link_windowmanager(fd, (wmWindowManager *)id);
break;
@@ -6914,7 +6931,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
if (sl) {
/* first channels for ipo action nla... */
- switch (sl->spacetype) {
+ switch(sl->spacetype) {
case SPACE_IPO:
ar= MEM_callocN(sizeof(ARegion), "area region from do_versions");
BLI_addtail(lb, ar);
@@ -7036,7 +7053,7 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
if (sl) {
/* if active spacetype has view2d data, copy that over to main region */
/* and we split view3d */
- switch (sl->spacetype) {
+ switch(sl->spacetype) {
case SPACE_VIEW3D:
view3d_split_250((View3D *)sl, lb);
break;
@@ -7442,7 +7459,8 @@ static void do_version_constraints_radians_degrees_250(ListBase *lb)
static void do_version_old_trackto_to_constraints(Object *ob)
{
/* create new trackto constraint from the relationship */
- if (ob->track) {
+ if (ob->track)
+ {
bConstraint *con= add_ob_constraint(ob, "AutoTrack", CONSTRAINT_TYPE_TRACKTO);
bTrackToConstraint *data = con->data;
@@ -7688,10 +7706,15 @@ static void do_versions_nodetree_multi_file_output_format_2_62_1(Scene *sce, bNo
bNodeSocket *old_image = BLI_findlink(&node->inputs, 0);
bNodeSocket *old_z = BLI_findlink(&node->inputs, 1);
bNodeSocket *sock;
+ char basepath[FILE_MAXDIR];
+ char filename[FILE_MAXFILE];
node->storage= nimf;
- BLI_strncpy(nimf->base_path, old_data->name, sizeof(nimf->base_path));
+ /* split off filename from the old path, to be used as socket sub-path */
+ BLI_split_dirfile(old_data->name, basepath, filename, sizeof(basepath), sizeof(filename));
+
+ BLI_strncpy(nimf->base_path, basepath, sizeof(nimf->base_path));
nimf->format = old_data->im_format;
/* if z buffer is saved, change the image type to multilayer exr.
@@ -7699,21 +7722,32 @@ static void do_versions_nodetree_multi_file_output_format_2_62_1(Scene *sce, bNo
* i'm just assuming here that IRIZ means IRIS with z buffer ...
*/
if (ELEM(old_data->im_format.imtype, R_IMF_IMTYPE_IRIZ, R_IMF_IMTYPE_OPENEXR)) {
+ char sockpath[FILE_MAX];
+
nimf->format.imtype = R_IMF_IMTYPE_MULTILAYER;
- sock = ntreeCompositOutputFileAddSocket(ntree, node, old_image->name, &nimf->format);
+
+ BLI_snprintf(sockpath, sizeof(sockpath), "%s_Image", filename);
+ sock = ntreeCompositOutputFileAddSocket(ntree, node, sockpath, &nimf->format);
+ /* XXX later do_versions copies path from socket name, need to set this explicitely */
+ BLI_strncpy(sock->name, sockpath, sizeof(sock->name));
if (old_image->link) {
old_image->link->tosock = sock;
sock->link = old_image->link;
}
- sock = ntreeCompositOutputFileAddSocket(ntree, node, old_z->name, &nimf->format);
+
+ BLI_snprintf(sockpath, sizeof(sockpath), "%s_Z", filename);
+ sock = ntreeCompositOutputFileAddSocket(ntree, node, sockpath, &nimf->format);
+ /* XXX later do_versions copies path from socket name, need to set this explicitely */
+ BLI_strncpy(sock->name, sockpath, sizeof(sock->name));
if (old_z->link) {
old_z->link->tosock = sock;
sock->link = old_z->link;
}
}
else {
- /* saves directly to base path, which is the old image output path */
- sock = ntreeCompositOutputFileAddSocket(ntree, node, "", &nimf->format);
+ sock = ntreeCompositOutputFileAddSocket(ntree, node, filename, &nimf->format);
+ /* XXX later do_versions copies path from socket name, need to set this explicitely */
+ BLI_strncpy(sock->name, filename, sizeof(sock->name));
if (old_image->link) {
old_image->link->tosock = sock;
sock->link = old_image->link;
@@ -8327,7 +8361,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
Mesh *me;
sound = main->sound.first;
- while (sound) {
+ while (sound)
+ {
sound->max_gain = 1.0;
sound->min_gain = 0.0;
sound->distance = 1.0;
@@ -8994,7 +9029,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
while (sce) {
ed= sce->ed;
if (ed) {
- SEQ_BEGIN (sce->ed, seq) {
+ SEQ_BEGIN(sce->ed, seq) {
if (seq->type==SEQ_IMAGE || seq->type==SEQ_MOVIE)
seq->flag |= SEQ_MAKE_PREMUL;
}
@@ -9743,16 +9778,17 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
if (md->type==eModifierType_Mirror) {
MirrorModifierData *mmd = (MirrorModifierData*) md;
- switch (mmd->axis) {
- case 0:
- mmd->flag |= MOD_MIR_AXIS_X;
- break;
- case 1:
- mmd->flag |= MOD_MIR_AXIS_Y;
- break;
- case 2:
- mmd->flag |= MOD_MIR_AXIS_Z;
- break;
+ switch(mmd->axis)
+ {
+ case 0:
+ mmd->flag |= MOD_MIR_AXIS_X;
+ break;
+ case 1:
+ mmd->flag |= MOD_MIR_AXIS_Y;
+ break;
+ case 2:
+ mmd->flag |= MOD_MIR_AXIS_Z;
+ break;
}
mmd->axis = 0;
@@ -10051,7 +10087,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
* */
{
Scene *sce;
- for (sce=main->scene.first; sce; sce = sce->id.next) {
+ for (sce=main->scene.first; sce; sce = sce->id.next)
+ {
if (sce->toolsettings->skgen_subdivisions[0] == sce->toolsettings->skgen_subdivisions[1] ||
sce->toolsettings->skgen_subdivisions[0] == sce->toolsettings->skgen_subdivisions[2] ||
sce->toolsettings->skgen_subdivisions[1] == sce->toolsettings->skgen_subdivisions[2])
@@ -10409,7 +10446,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
Sequence *seq;
for (sce=main->scene.first; sce; sce=sce->id.next) {
- SEQ_BEGIN (sce->ed, seq) {
+ SEQ_BEGIN(sce->ed, seq) {
if (seq->blend_mode == 0)
seq->blend_opacity = 100.0f;
}
@@ -10467,11 +10504,13 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
// convert fluids to modifier
- if (main->versionfile < 246 || (main->versionfile == 246 && main->subversionfile < 1)) {
+ if (main->versionfile < 246 || (main->versionfile == 246 && main->subversionfile < 1))
+ {
Object *ob;
for (ob = main->object.first; ob; ob= ob->id.next) {
- if (ob->fluidsimSettings) {
+ if (ob->fluidsimSettings)
+ {
FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifier_new(eModifierType_Fluidsim);
BLI_addhead(&ob->modifiers, (ModifierData *)fluidmd);
@@ -10762,7 +10801,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
while (sce) {
ed= sce->ed;
if (ed) {
- SEQP_BEGIN (ed, seq) {
+ SEQP_BEGIN(ed, seq) {
if (seq->strip && seq->strip->proxy) {
seq->strip->proxy->quality =90;
}
@@ -10795,8 +10834,10 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
bActuator *act;
int a;
- for (sound = main->sound.first; sound; sound = sound->id.next) {
- if (sound->newpackedfile) {
+ for (sound = main->sound.first; sound; sound = sound->id.next)
+ {
+ if (sound->newpackedfile)
+ {
sound->packedfile = sound->newpackedfile;
sound->newpackedfile = NULL;
}
@@ -10806,7 +10847,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
for (act= ob->actuators.first; act; act= act->next) {
if (act->type == ACT_SOUND) {
bSoundActuator *sAct = (bSoundActuator*) act->data;
- if (sAct->sound) {
+ if (sAct->sound)
+ {
sound = newlibadr(fd, lib, sAct->sound);
sAct->flag = sound->flags & SOUND_FLAGS_3D ? ACT_SND_3D_SOUND : 0;
sAct->pitch = sound->pitch;
@@ -10829,10 +10871,13 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- for (scene = main->scene.first; scene; scene = scene->id.next) {
- if (scene->ed && scene->ed->seqbasep) {
- SEQ_BEGIN (scene->ed, seq) {
- if (seq->type == SEQ_HD_SOUND) {
+ for (scene = main->scene.first; scene; scene = scene->id.next)
+ {
+ if (scene->ed && scene->ed->seqbasep)
+ {
+ SEQ_BEGIN(scene->ed, seq) {
+ if (seq->type == SEQ_HD_SOUND)
+ {
char str[FILE_MAX];
BLI_join_dirfile(str, sizeof(str), seq->strip->dir, seq->strip->stripdata->name);
BLI_path_abs(str, main->name);
@@ -11208,7 +11253,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
if (tex->vd->extend == 0)
tex->vd->extend = TEX_CLIP;
- for (sce= main->scene.first; sce; sce= sce->id.next) {
+ for (sce= main->scene.first; sce; sce= sce->id.next)
+ {
if (sce->audio.main == 0.0f)
sce->audio.main = 1.0f;
@@ -11350,7 +11396,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 8)) {
+ if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 8))
+ {
{
Scene *sce= main->scene.first;
while (sce) {
@@ -11472,7 +11519,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 9)) {
+ if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 9))
+ {
Scene *sce;
Mesh *me;
Object *ob;
@@ -11498,7 +11546,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 10)) {
+ if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 10))
+ {
Object *ob;
/* properly initialize hair clothsim data on old files */
@@ -11515,7 +11564,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
/* fix bad area setup in subversion 10 */
- if (main->versionfile == 250 && main->subversionfile == 10) {
+ if (main->versionfile == 250 && main->subversionfile == 10)
+ {
/* fix for new view type in sequencer */
bScreen *screen;
ScrArea *sa;
@@ -11554,7 +11604,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 11)) {
+ if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 11))
+ {
{
/* fix for new view type in sequencer */
bScreen *screen;
@@ -11596,7 +11647,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 12)) {
+ if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 12))
+ {
Scene *sce;
Object *ob;
Brush *brush;
@@ -11801,7 +11853,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
if ((sce->r.ffcodecdata.flags & FFMPEG_MULTIPLEX_AUDIO) == 0)
sce->r.ffcodecdata.audio_codec = 0x0; // CODEC_ID_NONE
- SEQ_BEGIN (sce->ed, seq) {
+ SEQ_BEGIN(sce->ed, seq) {
seq->volume = 1.0f;
}
SEQ_END
@@ -11957,7 +12009,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
- if (main->versionfile < 253) {
+ if (main->versionfile < 253)
+ {
Object *ob;
Scene *scene;
bScreen *sc;
@@ -12070,7 +12123,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
for (scene= main->scene.first; scene; scene=scene->id.next) {
if (scene) {
Sequence *seq;
- SEQ_BEGIN (scene->ed, seq) {
+ SEQ_BEGIN(scene->ed, seq) {
if (seq->sat==0.0f) {
seq->sat= 1.0f;
}
@@ -12168,7 +12221,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 253 || (main->versionfile == 253 && main->subversionfile < 1)) {
+ if (main->versionfile < 253 || (main->versionfile == 253 && main->subversionfile < 1))
+ {
Object *ob;
for (ob = main->object.first; ob; ob = ob->id.next) {
@@ -12177,7 +12231,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
if (md->type == eModifierType_Smoke) {
SmokeModifierData *smd = (SmokeModifierData *)md;
- if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) {
+ if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain)
+ {
smd->domain->vorticity = 2.0f;
smd->domain->time_scale = 1.0f;
@@ -12196,7 +12251,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
if (md2->type == eModifierType_Smoke) {
SmokeModifierData *smd2 = (SmokeModifierData *)md2;
- if ((smd2->type & MOD_SMOKE_TYPE_FLOW) && smd2->flow) {
+ if ((smd2->type & MOD_SMOKE_TYPE_FLOW) && smd2->flow)
+ {
smd2->flow->flags |= MOD_SMOKE_FLOW_INITVELOCITY;
}
}
@@ -12282,7 +12338,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
for (act= ob->actuators.first; act; act= act->next) {
if (act->type==ACT_STEERING) {
bSteeringActuator* stact = act->data;
- if (stact->facingaxis==0) {
+ if (stact->facingaxis==0)
+ {
stact->facingaxis=1;
}
}
@@ -12542,10 +12599,11 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
Scene *scene;
Sequence *seq;
- for (scene=main->scene.first; scene; scene=scene->id.next) {
+ for (scene=main->scene.first; scene; scene=scene->id.next)
+ {
scene->r.ffcodecdata.audio_channels = 2;
scene->audio.volume = 1.0f;
- SEQ_BEGIN (scene->ed, seq) {
+ SEQ_BEGIN(scene->ed, seq) {
seq->pitch = 1.0f;
}
SEQ_END
@@ -12716,7 +12774,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
{
/* set defaults for obstacle avoidance, recast data */
Scene *sce;
- for (sce = main->scene.first; sce; sce = sce->id.next) {
+ for (sce = main->scene.first; sce; sce = sce->id.next)
+ {
if (sce->gm.levelHeight == 0.f)
sce->gm.levelHeight = 2.f;
@@ -12896,7 +12955,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 260 || (main->versionfile == 260 && main->subversionfile < 6)) {
+ if (main->versionfile < 260 || (main->versionfile == 260 && main->subversionfile < 6))
+ {
Scene *sce;
MovieClip *clip;
bScreen *sc;
@@ -12960,7 +13020,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 260 || (main->versionfile == 260 && main->subversionfile < 8)) {
+ if (main->versionfile < 260 || (main->versionfile == 260 && main->subversionfile < 8))
+ {
Brush *brush;
for (brush= main->brush.first; brush; brush= brush->id.next) {
@@ -12969,7 +13030,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 261 || (main->versionfile == 261 && main->subversionfile < 1)) {
+ if (main->versionfile < 261 || (main->versionfile == 261 && main->subversionfile < 1))
+ {
{
/* update use flags for node sockets (was only temporary before) */
Scene *sce;
@@ -13070,7 +13132,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 261 || (main->versionfile == 261 && main->subversionfile < 2)) {
+ if (main->versionfile < 261 || (main->versionfile == 261 && main->subversionfile < 2))
+ {
{
/* convert Camera Actuator values to defines */
Object *ob;
@@ -13104,7 +13167,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 261 || (main->versionfile == 261 && main->subversionfile < 3)) {
+ if (main->versionfile < 261 || (main->versionfile == 261 && main->subversionfile < 3))
+ {
{
/* convert extended ascii to utf-8 for text editor */
Text *text;
@@ -13130,7 +13194,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
for (md= ob->modifiers.first; md; md= md->next) {
if (md->type == eModifierType_DynamicPaint) {
DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
- if (pmd->canvas) {
+ if (pmd->canvas)
+ {
DynamicPaintSurface *surface = pmd->canvas->surfaces.first;
for (; surface; surface=surface->next) {
surface->color_dry_threshold = 1.0f;
@@ -13145,7 +13210,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 262) {
+ if (main->versionfile < 262)
+ {
Object *ob;
for (ob=main->object.first; ob; ob= ob->id.next) {
ModifierData *md;
@@ -13160,7 +13226,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 263) {
+ if (main->versionfile < 263)
+ {
/* set fluidsim rate. the version patch for this in 2.62 was wrong, so
* try to correct it, if rate is 0.0 that's likely not intentional */
Object *ob;
@@ -13177,7 +13244,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 262 || (main->versionfile == 262 && main->subversionfile < 1)) {
+ if (main->versionfile < 262 || (main->versionfile == 262 && main->subversionfile < 1))
+ {
/* update use flags for node sockets (was only temporary before) */
Scene *sce;
bNodeTree *ntree;
@@ -13192,7 +13260,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
/* only swap for pre-release bmesh merge which had MLoopCol red/blue swap */
- if (main->versionfile == 262 && main->subversionfile == 1) {
+ if (main->versionfile == 262 && main->subversionfile == 1)
+ {
{
Mesh *me;
for (me = main->mesh.first; me; me = me->id.next) {
@@ -13202,7 +13271,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
- if (main->versionfile < 262 || (main->versionfile == 262 && main->subversionfile < 2)) {
+ if (main->versionfile < 262 || (main->versionfile == 262 && main->subversionfile < 2))
+ {
{
/* Set new idname of keyingsets from their now "label-only" name. */
Scene *scene;
@@ -13216,7 +13286,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 262 || (main->versionfile == 262 && main->subversionfile < 3)) {
+ if (main->versionfile < 262 || (main->versionfile == 262 && main->subversionfile < 3))
+ {
Object *ob;
ModifierData *md;
@@ -13230,7 +13301,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
- if (main->versionfile < 262 || (main->versionfile == 262 && main->subversionfile < 4)) {
+ if (main->versionfile < 262 || (main->versionfile == 262 && main->subversionfile < 4))
+ {
/* Read Viscosity presets from older files */
Object *ob;
@@ -13254,7 +13326,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
- if (main->versionfile < 263) {
+ if (main->versionfile < 263)
+ {
/* Default for old files is to save particle rotations to pointcache */
ParticleSettings *part;
for (part = main->particle.first; part; part = part->id.next)
@@ -13392,7 +13465,7 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath)
BLI_strncpy(bfd->main->name, filepath, sizeof(bfd->main->name));
while (bhead) {
- switch (bhead->code) {
+ switch(bhead->code) {
case DATA:
case DNA1:
case TEST: /* used as preview since 2.5x */
@@ -13960,7 +14033,7 @@ typedef struct tConstraintExpandData {
Main *mainvar;
} tConstraintExpandData;
/* callback function used to expand constraint ID-links */
-static void expand_constraint_cb(bConstraint *UNUSED(con), ID **idpoin, void *userdata)
+static void expand_constraint_cb(bConstraint *UNUSED(con), ID **idpoin, short UNUSED(isReference), void *userdata)
{
tConstraintExpandData *ced= (tConstraintExpandData *)userdata;
expand_doit(ced->fd, ced->mainvar, *idpoin);
@@ -14220,7 +14293,7 @@ static void expand_scene(FileData *fd, Main *mainvar, Scene *sce)
if (sce->ed) {
Sequence *seq;
- SEQ_BEGIN (sce->ed, seq) {
+ SEQ_BEGIN(sce->ed, seq) {
if (seq->scene) expand_doit(fd, mainvar, seq->scene);
if (seq->scene_camera) expand_doit(fd, mainvar, seq->scene_camera);
if (seq->sound) expand_doit(fd, mainvar, seq->sound);
@@ -14288,7 +14361,7 @@ static void expand_main(FileData *fd, Main *mainvar)
while (id) {
if (id->flag & LIB_TEST) {
- switch (GS(id->name)) {
+ switch(GS(id->name)) {
case ID_OB:
expand_object(fd, mainvar, (Object *)id);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 01:56:32 +0300