Merge branch 'alembic' into gooseberry

1 files changed, 22 insertions, 0 deletions

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 3fc76197be1..ac250588932 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -36,6 +36,7 @@
 #define DNA_DEPRECATED_ALLOW
 
 #include "DNA_brush_types.h"
+#include "DNA_cache_library_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_cloth_types.h"
 #include "DNA_constraint_types.h"
@@ -56,6 +57,7 @@
 
 #include "DNA_genfile.h"
 
+#include "BKE_colortools.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 #include "BKE_node.h"
@@ -1034,4 +1036,24 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 	}
+
+	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;
+					}
+				}
+			}
+		}
+	}
 }