Merge branch 'alembic' into gooseberry

Conflicts:
	source/blender/blenkernel/BKE_key.h
	source/blender/blenkernel/intern/key.c
	source/blender/bmesh/intern/bmesh_strands_conv.c

1 files changed, 20 insertions, 0 deletions

diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index 5d152fcc449..1c7975a91b2 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -559,6 +559,24 @@ class OBJECT_PT_cache_library(ObjectButtonsPanel, Panel):
         row.prop(md, "max_distance")
         col.prop(md, "use_double_sided")
 
+    def HAIRCUT(self, context, layout, cachelib, md):
+        col = layout.column(align=True)
+        col.prop_search(md, "object", context.blend_data, "objects", icon='OBJECT_DATA')
+        sub = col.column()
+        if (md.object):
+            sub.prop_search(md, "hair_system", md.object, "particle_systems")
+        else:
+            sub.enabled = False
+            sub.prop(md, "hair_system")
+
+        row = layout.row()
+        row.prop_search(md, "target", context.blend_data, "objects", icon='OBJECT_DATA')
+        row.prop(md, "use_internal_target", text="Internal")
+        layout.prop(md, "cut_mode", toggle=True, expand=True)
+
+        layout = layout.column()
+        layout.active = md.hair_system is not None
+
     def SHRINK_WRAP(self, context, layout, cachelib, md):
         col = layout.column(align=True)
         col.prop_search(md, "object", context.blend_data, "objects", icon='OBJECT_DATA')
@@ -602,6 +620,8 @@ class OBJECT_PT_cache_library(ObjectButtonsPanel, Panel):
         #sub.operator("object.shape_key_remove", icon='ZOOMOUT', text="").all = False
         sub.menu("CACHELIB_MT_shape_key_specials", icon='DOWNARROW_HLT', text="")
 
+        col.prop(md, "use_motion_state")
+
         if kb:
             col.separator()