[Bf-blender-cvs] [b90b02a] blender2.8: Merge branch 'master' into blender2.8
Campbell Barton
noreply at git.blender.org
Tue Jun 28 13:21:43 CEST 2016
Commit: b90b02a480e04027c9a50938241833caa8341594
Author: Campbell Barton
Date: Tue Jun 28 21:21:11 2016 +1000
Branches: blender2.8
https://developer.blender.org/rBb90b02a480e04027c9a50938241833caa8341594
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/writefile.c
index 194ad72,9cf32e1..3912534
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -1369,48 -1705,69 +1497,51 @@@ static void write_modifiers(WriteData *
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;
-
- 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);
+ 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) {
- writestruct(wd, DATA, "SmokeDomainSettings", 1, smd->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]->step = 1;
-
- write_pointcaches(wd, &(smd->domain->ptcaches[1]));
- }
-
+ writestruct(wd, DATA, SmokeDomainSettings, 1, smd->domain);
if (smd->domain) {
- writestruct(wd, DATA, "EffectorWeights", 1, smd->domain->effector_weights);
- /* 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)
- writestruct(wd, DATA, "SmokeFlowSettings", 1, smd->flow);
- else if (smd->type & MOD_SMOKE_TYPE_COLL)
- writestruct(wd, DATA, "SmokeCollSettings", 1, smd->coll);
+ else if (smd->type & MOD_SMOKE_TYPE_FLOW) {
+ writestruct(wd, DATA, SmokeFlowSettings, 1, smd->flow);
+ }
+ 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;
-
- writestruct(wd, DATA, "FluidsimSettings", 1, fluidmd->fss);
+ 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);
-
+ writestruct(wd, DATA, DynamicPaintCanvasSettings, 1, pmd->canvas);
+
/* write surfaces */
- for (surface=pmd->canvas->surfaces.first; surface; surface=surface->next)
- writestruct(wd, DATA, "DynamicPaintSurface", 1, surface);
+ 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) {
- writestruct(wd, DATA, "EffectorWeights", 1, surface->effector_weights);
+ for (surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
- write_pointcaches(wd, &(surface->ptcaches));
-
+ writestruct(wd, DATA, EffectorWeights, 1, surface->effector_weights);
}
}
if (pmd->brush) {
@@@ -1502,30 -1862,32 +1636,30 @@@ static void write_objects(WriteData *wd
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);
+
+ writestruct(wd, DATA, PartDeflect, 1, ob->pd);
+ writestruct(wd, DATA, SoftBody, 1, ob->soft);
if (ob->soft) {
- writestruct(wd, DATA, "EffectorWeights", 1, ob->soft->effector_weights);
- write_pointcaches(wd, &ob->soft->ptcaches);
+ writestruct(wd, DATA, EffectorWeights, 1, ob->soft->effector_weights);
}
- writestruct(wd, DATA, "BulletSoftBody", 1, ob->bsoft);
-
+ 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
- writestruct(wd, DATA, "RigidBodyOb", 1, ob->rigidbody_object);
+ /* 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) {
- writestruct(wd, DATA, "RigidBodyCon", 1, ob->rigidbody_constraint);
+ writestruct(wd, DATA, RigidBodyCon, 1, ob->rigidbody_constraint);
}
if (ob->type == OB_EMPTY && ob->empty_drawtype == OB_EMPTY_IMAGE) {
- writestruct(wd, DATA, "ImageUser", 1, ob->iuser);
+ writestruct(wd, DATA, ImageUser, 1, ob->iuser);
}
- write_particlesystems(wd, &ob->particlesystem);
write_modifiers(wd, &ob->modifiers);
- writelist(wd, DATA, "LinkData", &ob->pc_ids);
- writelist(wd, DATA, "LodLevel", &ob->lodlevels);
+ writelist(wd, DATA, LinkData, &ob->pc_ids);
+ writelist(wd, DATA, LodLevel, &ob->lodlevels);
}
write_previews(wd, ob->preview);
@@@ -2365,13 -2806,14 +2578,13 @@@ static void write_scenes(WriteData *wd
}
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);
+ 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);
@@@ -3525,34 -4018,35 +3789,34 @@@ 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);
More information about the Bf-blender-cvs
mailing list