diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-01 15:34:11 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-01 15:34:11 +0300 |
| commit | 11af9e9a5bd1caff1ec46794bda2934a01ce5035 (patch) | |
| tree | d4f76f59c5f6398a07a36eb8e99558e6f4a84b8d /release/scripts/presets | |
| parent | faec4309147988fbab7b7d7ec661f5130358d169 (diff) | |
| parent | b08473680e141ab6f28f99fc3b1dbbc4add89bed (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/blender_curves.cpp
intern/cycles/blender/blender_particles.cpp
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/depsgraph/intern/depsgraph_build.cc
Diffstat (limited to 'release/scripts/presets')
| -rw-r--r-- | release/scripts/presets/interface_theme/blender_24x.xml | 2 | ||||
| -rw-r--r-- | release/scripts/presets/keyconfig/maya.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/presets/interface_theme/blender_24x.xml b/release/scripts/presets/interface_theme/blender_24x.xml index 445c23b4c4e..ae42b605556 100644 --- a/release/scripts/presets/interface_theme/blender_24x.xml +++ b/release/scripts/presets/interface_theme/blender_24x.xml @@ -179,7 +179,7 @@ </wcol_tooltip> <wcol_menu_item> <ThemeWidgetColors outline="#000000" - inner="#00000000" + inner="#d2d2d200" inner_sel="#7f7f7fff" item="#ffffffff" text="#000000" diff --git a/release/scripts/presets/keyconfig/maya.py b/release/scripts/presets/keyconfig/maya.py index cdd16f26877..67fd1fddcac 100644 --- a/release/scripts/presets/keyconfig/maya.py +++ b/release/scripts/presets/keyconfig/maya.py @@ -698,7 +698,7 @@ kmi.properties.level = 5 km = kc.keymaps.new('Knife Tool Modal Map', space_type='EMPTY', region_type='WINDOW', modal=True) kmi = km.keymap_items.new_modal('CANCEL', 'ESC', 'ANY', any=True) -kmi = km.keymap_items.new_modal('ADD_CUT', 'LEFTMOUSE', 'ANY') +kmi = km.keymap_items.new_modal('ADD_CUT', 'LEFTMOUSE', 'ANY', any=True) kmi = km.keymap_items.new_modal('PANNING', 'LEFTMOUSE', 'ANY', alt=True) kmi = km.keymap_items.new_modal('PANNING', 'MIDDLEMOUSE', 'ANY', alt=True) kmi = km.keymap_items.new_modal('PANNING', 'RIGHTMOUSE', 'ANY', alt=True) |