Merge branch 'master' into blender2.8

3 files changed, 77 insertions, 57 deletions

diff --git a/release/scripts/presets/interface_theme/back_to_black.xml b/release/scripts/presets/interface_theme/back_to_black.xml
index 915e9cb64f1..1636f5b5cf6 100644
--- a/release/scripts/presets/interface_theme/back_to_black.xml
+++ b/release/scripts/presets/interface_theme/back_to_black.xml
@@ -18,7 +18,7 @@
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_regular>
         <wcol_tool>
@@ -30,19 +30,19 @@
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_tool>
         <wcol_radio>
           <ThemeWidgetColors outline="#2a2a2a"
                              inner="#111111ff"
                              inner_sel="#33406bff"
-                             item="#191919ff"
+                             item="#444444ff"
                              text="#929292"
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_radio>
         <wcol_text>
@@ -50,23 +50,23 @@
                              inner="#111111ff"
                              inner_sel="#33406bff"
                              item="#191919ff"
-                             text="#e4e4e4"
+                             text="#929292"
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_text>
         <wcol_option>
-          <ThemeWidgetColors outline="#2a2a2a"
+          <ThemeWidgetColors outline="#535353"
                              inner="#111111ff"
                              inner_sel="#33406bff"
-                             item="#000000ff"
-                             text="#c7c7c7"
+                             item="#a3a3a3ff"
+                             text="#929292"
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_option>
         <wcol_toggle>
@@ -78,7 +78,7 @@
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_toggle>
         <wcol_num>
@@ -90,7 +90,7 @@
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_num>
         <wcol_numslider>
@@ -102,7 +102,7 @@
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_numslider>
         <wcol_box>
@@ -114,7 +114,7 @@
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_box>
         <wcol_menu>
@@ -126,7 +126,7 @@
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_menu>
         <wcol_pulldown>
@@ -138,7 +138,7 @@
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_pulldown>
         <wcol_menu_back>
@@ -150,7 +150,7 @@
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_menu_back>
         <wcol_pie_menu>
@@ -170,7 +170,7 @@
                              inner="#191919e6"
                              inner_sel="#2d2d2de6"
                              item="#646464ff"
-                             text="#ffffff"
+                             text="#929292"
                              text_sel="#ffffff"
                              show_shaded="FALSE"
                              shadetop="25"
@@ -186,7 +186,7 @@
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_menu_item>
         <wcol_scroll>
@@ -198,7 +198,7 @@
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_scroll>
         <wcol_progress>
@@ -210,7 +210,7 @@
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_progress>
         <wcol_list_item>
@@ -222,7 +222,7 @@
                              text_sel="#ffffff"
                              show_shaded="TRUE"
                              shadetop="-100"
-                             shadedown="0">
+                             shadedown="5">
           </ThemeWidgetColors>
         </wcol_list_item>
         <wcol_state>
@@ -239,32 +239,35 @@
     </user_interface>
     <view_3d>
       <ThemeView3D grid="#222222"
+                   clipping_border_3d="#313131ff"
                    wire="#888888"
-                   wire_edit="#000000"
+                   wire_edit="#6c75ff"
                    gp_vertex="#000000"
                    gp_vertex_select="#ff8500"
                    gp_vertex_size="3"
-                   lamp="#c1d40028"
-                   speaker="#535353"
-                   camera="#000000"
-                   view_overlay="#000000"
-                   empty="#000000"
+                   text_grease_pencil="#b5e61d"
                    object_selected="#f15800"
                    object_active="#ff8c19"
                    object_grouped="#083008"
                    object_grouped_active="#55bb55"
-                   transform="#ffffff"
+                   text_keyframe="#ddd700"
+                   camera="#535353"
+                   empty="#535353"
+                   lamp="#fff0d328"
+                   speaker="#535353"
                    vertex="#72cfdd"
                    vertex_select="#ff8500"
                    vertex_size="3"
+                   vertex_bevel="#00a5ff"
                    vertex_unreferenced="#000000"
                    edge_select="#ffa000"
                    edge_seam="#db2512"
                    edge_sharp="#ff2020"
                    edge_crease="#cc0099"
+                   edge_bevel="#00a5ff"
                    edge_facesel="#6b6b6b"
                    freestyle_edge_mark="#7fff7f"
-                   face="#73828f12"
+                   face="#73828f41"
                    face_select="#ffa4003c"
                    face_dot="#ffa900"
                    facedot_size="4"
@@ -291,19 +294,18 @@
                    normal="#22dddd"
                    vertex_normal="#2361dd"
                    split_normal="#dd23dd"
-                   bone_solid="#c8c8c8"
                    bone_pose="#50c8ff"
                    bone_pose_active="#8cffff"
-                   frame_current="#60c040"
-                   outline_width="1"
+                   bone_solid="#c8c8c8"
                    bundle_solid="#c8c8c8"
                    camera_path="#5a5a5a"
                    skin_root="#000000"
-                   clipping_border_3d="#313131ff"
-                   text_keyframe="#ddd700"
-                   text_grease_pencil="#b5e61d"
+                   view_overlay="#000000"
+                   transform="#ffffff"
+                   frame_current="#60c040"
                    paint_curve_handle="#7fff7f7f"
-                   paint_curve_pivot="#ff7f7f7f">
+                   paint_curve_pivot="#ff7f7f7f"
+                   outline_width="1">
         <space>
           <ThemeSpaceGradient title="#5d5d5d"
                               text="#7d7d7d"
@@ -312,23 +314,23 @@
                               header_text="#979797"
                               header_text_hi="#ffffff"
                               button="#00000057"
-                              button_title="#c5c5c5"
+                              button_title="#929292"
                               button_text="#c3c3c3"
-                              button_text_hi="#ffffff"
+                              button_text_hi="#e5e5e5"
                               tab_active="#212947"
                               tab_inactive="#000000"
                               tab_back="#060606ff"
                               tab_outline="#000000">
             <gradients>
               <ThemeGradientColors show_grad="TRUE"
-                                   gradient="#0a0a0a"
+                                   gradient="#1d1d1d"
                                    high_gradient="#000000">
               </ThemeGradientColors>
             </gradients>
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -348,6 +350,7 @@
                         vertex="#ffffff"
                         vertex_select="#ff8500"
                         vertex_size="3"
+                        vertex_bevel="#000000"
                         vertex_unreferenced="#000000"
                         handle_free="#808080"
                         handle_auto="#909000"
@@ -382,7 +385,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -418,7 +421,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -463,7 +466,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -501,6 +504,7 @@
                       keyframe_jitter_selected="#61c042"
                       keyframe_border="#000000ff"
                       keyframe_border_selected="#000000ff"
+                      keyframe_scale_factor="1"
                       summary="#00000000">
         <space>
           <ThemeSpaceGeneric back="#080808"
@@ -521,7 +525,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -543,6 +547,7 @@
                         vertex="#0f13bb"
                         vertex_select="#ff8500"
                         vertex_size="3"
+                        vertex_bevel="#000000"
                         vertex_unreferenced="#000000"
                         face="#ffffff0a"
                         face_select="#ff85003c"
@@ -596,7 +601,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -644,7 +649,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -673,7 +678,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -712,7 +717,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -744,7 +749,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -799,7 +804,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -835,7 +840,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -865,7 +870,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -903,7 +908,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -932,7 +937,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -966,7 +971,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
@@ -1019,7 +1024,7 @@
             <panelcolors>
               <ThemePanelColors header="#00000019"
                                 back="#72727280"
-                                show_header="FALSE"
+                                show_header="TRUE"
                                 show_back="FALSE">
               </ThemePanelColors>
             </panelcolors>
diff --git a/release/scripts/presets/keyconfig/3dsmax.py b/release/scripts/presets/keyconfig/3dsmax.py
index b6b0a0c926f..a07a3a52caf 100644
--- a/release/scripts/presets/keyconfig/3dsmax.py
+++ b/release/scripts/presets/keyconfig/3dsmax.py
@@ -400,6 +400,12 @@ kmi = km.keymap_items.new('particle.hide', 'H', 'PRESS')
 kmi.properties.unselected = False
 kmi = km.keymap_items.new('particle.hide', 'H', 'PRESS', shift=True)
 kmi.properties.unselected = True
+kmi = km.keymap_items.new('view3d.manipulator', 'LEFTMOUSE', 'PRESS', shift=True)
+kmi.properties.release_confirm = True
+kmi.properties.use_planar_constraint= True
+kmi = km.keymap_items.new('view3d.manipulator', 'LEFTMOUSE', 'PRESS', shift=True)
+kmi.properties.release_confirm = True
+kmi.properties.use_accurate= True
 kmi = km.keymap_items.new('view3d.manipulator', 'LEFTMOUSE', 'PRESS', any=True)
 kmi.properties.release_confirm = True
 kmi = km.keymap_items.new('particle.brush_edit', 'LEFTMOUSE', 'PRESS')
@@ -421,6 +427,12 @@ kmi.properties.value_2 = 'ENABLED'
 # Map 3D View
 km = kc.keymaps.new('3D View', space_type='VIEW_3D', region_type='WINDOW', modal=False)
 
+kmi = km.keymap_items.new('view3d.manipulator', 'LEFTMOUSE', 'PRESS', shift=True)
+kmi.properties.release_confirm = True
+kmi.properties.use_planar_constraint= True
+kmi = km.keymap_items.new('view3d.manipulator', 'LEFTMOUSE', 'PRESS', shift=True)
+kmi.properties.release_confirm = True
+kmi.properties.use_accurate= True
 kmi = km.keymap_items.new('view3d.manipulator', 'LEFTMOUSE', 'PRESS', any=True)
 kmi.properties.release_confirm = True
 kmi = km.keymap_items.new('view3d.cursor3d', 'ACTIONMOUSE', 'PRESS')
diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py
index 3f4754863c6..cf213c1ddbd 100644
--- a/release/scripts/presets/keyconfig/maya.py
+++ b/release/scripts/presets/keyconfig/maya.py
@@ -935,6 +935,9 @@ kmi = km.keymap_items.new('view3d.rotate', 'LEFTMOUSE', 'PRESS', alt=True)
 kmi = km.keymap_items.new('view3d.manipulator', 'LEFTMOUSE', 'PRESS', shift=True)
 kmi.properties.release_confirm = True
 kmi.properties.use_planar_constraint = True
+kmi = km.keymap_items.new('view3d.manipulator', 'LEFTMOUSE', 'PRESS', shift=True)
+kmi.properties.release_confirm = True
+kmi.properties.use_accurate = True
 kmi = km.keymap_items.new('view3d.manipulator', 'LEFTMOUSE', 'PRESS', any=True)
 kmi.properties.release_confirm = True
 kmi = km.keymap_items.new('view3d.move', 'MIDDLEMOUSE', 'PRESS', alt=True)