NLA SoC: Merge from 2.5

20571 to 20667

diff --cc release/ui/buttons_data_modifier.py
index 6de2d6454714d0920b73ccf3c6ded0df1d250243,0f5d446f889b2f788214cb02159d4fb4d70f94dd..72b2f29100eb4ecbb1a194e4ed37e67194dbe934
--- 1/release/ui/buttons_data_modifier.py
--- 2/release/ui/buttons_data_modifier.py
+++ b/release/ui/buttons_data_modifier.py
@@@ -103,7 -103,9 +103,9 @@@ class DATA_PT_modifiers(DataButtonsPane
                if md.fit_type == 'FIT_LENGTH':
                        layout.itemR(md, "length")
                if md.fit_type == 'FIT_CURVE':
 -                      layout.itemR(md, "curve")
 +                              layout.itemR(md, "curve")
+ 
+               layout.itemS()
                
                split = layout.split()
                
@@@ -249,13 -259,16 +259,16 @@@
                        layout.itemR(md, "vertex_group")
                layout.itemR(md, "inverse")
                
-       def meshdeform(self, layout, md):
+       def mesh_deform(self, layout, md):
 -              layout.itemR(md, "object")
 +              layout.itemR(md, "mesh")
                layout.itemR(md, "vertex_group")
                layout.itemR(md, "invert")
-               layout.itemR(md, "precision")
-               layout.itemR(md, "dynamic")
-               # Missing: "Bind"
+ 
+               layout.itemS()
+               layout.itemO("OBJECT_OT_modifier_mdef_bind", text="Bind")
+               row = layout.row()
+               row.itemR(md, "precision")
+               row.itemR(md, "dynamic")
                
        def mirror(self, layout, md):
                layout.itemR(md, "merge_limit")

diff --cc source/blender/blenloader/intern/readfile.c
Simple merge

diff --cc source/blender/editors/screen/screen_ops.c
Simple merge

diff --cc source/blender/editors/space_file/filesel.c
Simple merge

diff --cc source/blender/editors/space_view3d/space_view3d.c
index 3b3fd5109cfc4e068aeb8fb047d76e597c74daf9,6e33b1dcaabdef06ca1df958d9303841ae5abd02..eaff77aabe92511d7da1de517bbe43812563e1fb
--- 1/source/blender/editors/space_view3d/space_view3d.c
--- 2/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@@ -393,7 -393,9 +393,8 @@@ static void view3d_main_area_listener(A
                                case ND_GEOM_DATA:
                                case ND_DRAW:
                                case ND_MODIFIER:
 -                              case ND_CONSTRAINT:
                                case ND_KEYS:
+                               case ND_PARTICLE:
                                        ED_region_tag_redraw(ar);
                                        break;
                        }

diff --cc source/blender/makesdna/DNA_space_types.h
Simple merge