Commit: 4f64596916f8af9883782c4124ea0da72249f724
Author: Antony Riakiotakis
Date: Thu Jun 4 20:51:17 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB4f64596916f8af9883782c4124ea0da72249f724
Merge branch 'master' into gooseberry
Conflicts:
source/blender/makesdna/DNA_object_types.h
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 269a045,37c2556..fa32469
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1035,34 -830,19 +1035,48 @@@ void blo_do_versions_270(FileData *fd,
scene->r.simplify_particles_render =
scene->r.simplify_particles;
}
}
+
+ if (!DNA_struct_elem_find(fd->filesdna, "DecimateModifierData",
"float", "defgrp_factor")) {
+ Object *ob;
+
+ for (ob = main->object.first; ob; ob = ob->id.next) {
+ ModifierData *md;
+ for (md = ob->modifiers.first; md; md =
md->next) {
+ if (md->type == eModifierType_Decimate)
{
+ DecimateModifierData *dmd =
(DecimateModifierData *)md;
+ dmd->defgrp_factor = 1.0f;
+ }
+ }
+ }
+ }
}
+
+ if (!DNA_struct_elem_find(fd->filesdna, "HairSimParams",
"CurveMapping", "*bend_stiffness_mapping")) {
+ CacheLibrary *cachelib;
+ for (cachelib = main->cache_library.first; cachelib; cachelib =
cachelib->id.next) {
+ CacheModifier *md;
+ for (md = cachelib->modifiers.first; md; md = md->next)
{
+ if (md->type ==
eCacheModifierType_HairSimulation) {
+ HairSimCacheModifier *hsmd =
(HairSimCacheModifier *)md;
+ {
+ CurveMapping *cm =
curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+ cm->cm[0].curve[0].x = 0.0f;
+ cm->cm[0].curve[0].y = 1.0f;
+ cm->cm[0].curve[1].x = 1.0f;
+ cm->cm[0].curve[1].y = 1.0f;
+
hsmd->sim_params.bend_stiffness_mapping = cm;
+ }
+ }
+ }
+ }
+ }
+
+ /* from_extra has been moved to fromtype, fromindex */
+ if (!DNA_struct_elem_find(fd->filesdna, "Key", "int", "fromindex")) {
+ Key *key;
+ for (key = main->key.first; key; key = key->id.next) {
+ key->fromtype = key->from_extra.type;
+ key->fromindex = key->from_extra.index;
+ }
+ }
}
diff --cc source/blender/makesdna/DNA_object_types.h
index e45ba79,50f94aa..10e5961
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@@ -251,8 -244,6 +251,12 @@@ typedef struct Object
short index; /* custom index, for renderpasses */
unsigned short actdef; /* current deformation group, note: index
starts at 1 */
+ unsigned short actfmap; /* current face map, note: index starts at 1 */
- unsigned short pad2[3];
++ unsigned short pad2[2];
++
++ /* did last modifier stack generation need mapping support? */
++ short lastNeedMapping;
++
float col[4]; /* object color */
int gameflag;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
