Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Thu, 2 Mar 2017 18:15:32 +0000 (19:15 +0100)
committerJulian Eisel <eiseljulian@gmail.com>
Thu, 2 Mar 2017 18:15:32 +0000 (19:15 +0100)
Conflicts:
source/blender/blenkernel/intern/scene.c

1  2 
release/scripts/presets/keyconfig/maya.py
source/blender/blenkernel/intern/mesh.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_modifier.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_manipulator.c

index 99d21064a4c9acbd8afe352a95b9fec1556ca30a,62f12cd7967d7e8e0fabbece580cb377a66b5aa6..f36362368203baf734a4b02eeaa84c4184e20d50
@@@ -438,12 -426,11 +438,12 @@@ static void template_ID
  
                if ((idfrom && idfrom->lib) || !editable)
                        UI_but_flag_enable(but, UI_BUT_DISABLED);
 -              
 -              uiLayoutRow(layout, true);
 +              if (use_big_size) {
 +                      uiLayoutRow(layout, true);
 +              }
        }
        else if (flag & UI_ID_BROWSE) {
-               but = uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, UI_UNIT_X * 1.6, UI_UNIT_Y,
+               but = uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, UI_UNIT_X * 1.5, UI_UNIT_Y,
                                     TIP_(template_id_browse_tip(type)));
                ui_def_but_icon(but, RNA_struct_ui_icon(type), UI_HAS_ICON);
                /* default dragging of icon for id browse buttons */