diff options
| author | Ines Almeida <britalmeida@gmail.com> | 2018-10-13 20:49:26 +0300 |
|---|---|---|
| committer | Ines Almeida <britalmeida@gmail.com> | 2018-10-13 20:49:26 +0300 |
| commit | ab62b7e971ab446c8c286fac305a846f83161e50 (patch) | |
| tree | 7fd5a67b9653e2e10efee94374e812e76da86a05 /release/scripts/presets | |
| parent | cc8424e73324b772621045c1856f9a8869faa859 (diff) | |
| parent | dd6bf3f84a9137affbcd8ba0fc957c32b8c0aff7 (diff) | |
Merge branch 'origin/blender2.8' into temp-ui-layout-2.8temp-ui-layout-2.8
Diffstat (limited to 'release/scripts/presets')
| -rw-r--r-- | release/scripts/presets/interface_theme/blender_dark.xml | 6 | ||||
| -rw-r--r-- | release/scripts/presets/interface_theme/blender_light.xml (renamed from release/scripts/presets/interface_theme/flatty_light.xml) | 0 | ||||
| -rw-r--r-- | release/scripts/presets/keyconfig/blender_27x.py | 27 |
3 files changed, 24 insertions, 9 deletions
diff --git a/release/scripts/presets/interface_theme/blender_dark.xml b/release/scripts/presets/interface_theme/blender_dark.xml new file mode 100644 index 00000000000..8bbb747447b --- /dev/null +++ b/release/scripts/presets/interface_theme/blender_dark.xml @@ -0,0 +1,6 @@ +<bpy> + <Theme> + </Theme> + <ThemeStyle> + </ThemeStyle> +</bpy> diff --git a/release/scripts/presets/interface_theme/flatty_light.xml b/release/scripts/presets/interface_theme/blender_light.xml index 497b6575731..497b6575731 100644 --- a/release/scripts/presets/interface_theme/flatty_light.xml +++ b/release/scripts/presets/interface_theme/blender_light.xml diff --git a/release/scripts/presets/keyconfig/blender_27x.py b/release/scripts/presets/keyconfig/blender_27x.py index 6fb0df832ca..3cb6388e43e 100644 --- a/release/scripts/presets/keyconfig/blender_27x.py +++ b/release/scripts/presets/keyconfig/blender_27x.py @@ -4619,21 +4619,30 @@ keyconfig_data = \ }, ), ("wm.context_toggle_enum", - {"type": 'Z', "value": 'PRESS', "alt": True}, + {"type": 'Z', "value": 'PRESS'}, {"properties": [("data_path", 'space_data.shading.type'), - ("value_1", 'SOLID'), - ("value_2", 'TEXTURED'), + ("value_1", 'WIREFRAME'), + ("value_2", 'SOLID'), ], }, ), - ("view3d.toggle_render", {"type": 'Z', "value": 'PRESS', "shift": True}, None), - ("view3d.toggle_xray_draw_option", {"type": 'Z', "value": 'PRESS'}, None), - ("wm.context_toggle", - {"type": 'Z', "value": 'PRESS'}, + ("wm.context_toggle_enum", + {"type": 'Z', "value": 'PRESS', "shift": True}, {"properties": - [("data_path", 'space_data.use_occlude_geometry'), - ], + [("data_path", 'space_data.shading.type'), + ("value_1", 'RENDERED'), + ("value_2", 'SOLID'), + ], + }, + ), + ("wm.context_toggle_enum", + {"type": 'Z', "value": 'PRESS', "alt": True}, + {"properties": + [("data_path", 'space_data.shading.type'), + ("value_1", 'MATERIAL'), + ("value_2", 'SOLID'), + ], }, ), ("view3d.select", |