Commit: 2976eb598a572cbc991580720e327b9d12adfe1d
Author: Lukas Tönne
Date: Sat Oct 4 11:19:01 2014 +0200
Branches: hair_immediate_fixes
https://developer.blender.org/rB2976eb598a572cbc991580720e327b9d12adfe1d
Merge branch 'master' into hair_immediate_fixes
Conflicts:
source/blender/blenloader/intern/versioning_270.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index a365c1b,d8da0a1..98d1cd1
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -378,49 -390,19 +392,62 @@@ void blo_do_versions_270(FileData *fd,
}
}
}
+
+ if (!MAIN_VERSION_ATLEAST(main, 272, 1)) {
+ Brush *br;
+ for (br = main->brush.first; br; br = br->id.next) {
+ if ((br->ob_mode & OB_MODE_SCULPT) &&
ELEM(br->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_SNAKE_HOOK))
+ br->alpha = 1.0f;
+ }
+ }
+
+ if (!DNA_struct_elem_find(fd->filesdna, "Image", "float", "gen_color"))
{
+ Image *image;
+ for (image = main->image.first; image != NULL; image =
image->id.next) {
+ image->gen_color[3] = 1.0f;
+
+ if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings", "int",
"voxel_res")) {
+ Object *ob;
+ ModifierData *md;
+ for (ob = main->object.first; ob; ob = ob->id.next) {
+ for (md = ob->modifiers.first; md; md = md->next) {
+ if (md->type == eModifierType_Cloth) {
+ ClothModifierData *clmd =
(ClothModifierData*) md;
+ clmd->sim_parms->voxel_res = 32;
+ }
+ else if (md->type ==
eModifierType_ParticleSystem) {
+ ParticleSystemModifierData *pmd =
(ParticleSystemModifierData*) md;
+ if (pmd->psys->clmd) {
+
pmd->psys->clmd->sim_parms->voxel_res = 32;
+ }
+ }
+ }
+ }
+ }
+
+ if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings", "float",
"bending_damping")) {
+ Object *ob;
+ ModifierData *md;
+ for (ob = main->object.first; ob; ob = ob->id.next) {
+ for (md = ob->modifiers.first; md; md = md->next) {
+ if (md->type == eModifierType_Cloth) {
+ ClothModifierData *clmd =
(ClothModifierData*) md;
+ clmd->sim_parms->bending_damping = 0.5f;
+ }
+ else if (md->type ==
eModifierType_ParticleSystem) {
+ ParticleSystemModifierData *pmd =
(ParticleSystemModifierData*) md;
+ if (pmd->psys->clmd) {
+
pmd->psys->clmd->sim_parms->bending_damping = 0.5f;
+ }
+ }
+ }
+ }
+ }
+
+ if (!DNA_struct_elem_find(fd->filesdna, "Key", "KeyOwner", "owner")) {
+ Key *key;
+ for (key = main->key.first; key; key = key->id.next) {
+ BKE_key_set_from_id(key, key->from);
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
