Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Bastien Montagne
2016-10-03 20:48:00 +02:00
parent 72473a61b0 103fbb3afc
commit 55aadccbde
17 changed files with 24 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/modules/bpy_extras/keyconfig_utils.py
View File

@@ -136,6 +136,7 @@ KM_HIERARCHY = [
('Standard Modal Map', 'EMPTY', 'WINDOW', []),
('Transform Modal Map', 'EMPTY', 'WINDOW', []),
('Eyedropper Modal Map', 'EMPTY', 'WINDOW', []),
]

13
release/scripts/presets/interface_theme/back_to_black.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#354d66"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#b1b1b1"
active_file_text="#ffffff">
<ThemeFileBrowser selected_file="#354d66">
<space>
<ThemeSpaceGeneric back="#000000"
title="#5d5d5d"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#181818"
list_title="#9e9e9e"
list_text="#5d5d5d"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/blender_24x.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#a0a0d0"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#828282"
active_file_text="#ffffff">
<ThemeFileBrowser selected_file="#a0a0d0">
<space>
<ThemeSpaceGeneric back="#808080"
title="#000000"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#b4b4b4"
list_title="#000000"
list_text="#000000"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/elsyiun.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#755129"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#828282"
active_file_text="#fafafa">
<ThemeFileBrowser selected_file="#755129">
<space>
<ThemeSpaceGeneric back="#4b4b4b"
title="#8b8b8b"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#3b3b3b"
list_title="#8b8b8b"
list_text="#8b8b8b"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/flatty_light.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#ff8c19"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#828282"
active_file_text="#fafafa">
<ThemeFileBrowser selected_file="#ff8c19">
<space>
<ThemeSpaceGeneric back="#404040"
title="#000000"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#808080"
list_title="#000000"
list_text="#000000"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/graph.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#607f9e"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#ffffff"
active_file_text="#ffffff">
<ThemeFileBrowser selected_file="#607f9e">
<space>
<ThemeSpaceGeneric back="#4b4b4b"
title="#e4e4e4"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#3b3b3b"
list_title="#8b8b8b"
list_text="#8b8b8b"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/hexagon.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#69a5be"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#859cb9"
active_file_text="#fafafa">
<ThemeFileBrowser selected_file="#69a5be">
<space>
<ThemeSpaceGeneric back="#646875"
title="#000000"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#6c717f"
list_title="#d7d7d7"
list_text="#d7d7d7"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/rtheme.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#ff8c19"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#828282"
active_file_text="#fafafa">
<ThemeFileBrowser selected_file="#ff8c19">
<space>
<ThemeSpaceGeneric back="#9098a0"
title="#000000"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#484848"
list_title="#000000"
list_text="#000000"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/science_lab.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#517da1"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#828282"
active_file_text="#fafafa">
<ThemeFileBrowser selected_file="#517da1">
<space>
<ThemeSpaceGeneric back="#363636"
title="#646464"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#444444"
list_title="#c0c0c0"
list_text="#999999"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/softimage.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#f1e593"
scrollbar="#4d4b4d"
scroll_handle="#8c8a88"
active_file="#f1e593"
active_file_text="#ffffff">
<ThemeFileBrowser selected_file="#f1e593">
<space>
<ThemeSpaceGeneric back="#aca8a7"
title="#ffffff"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#aaa8a6"
list_title="#3a3a3a"
list_text="#7f7f7f"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>

13
release/scripts/presets/interface_theme/ubuntu_ambiance.xml
View File

@@ -398,11 +398,7 @@
</ThemeGraphEditor>
</graph_editor>
<file_browser>
<ThemeFileBrowser selected_file="#6b395a"
scrollbar="#a0a0a0"
scroll_handle="#7f7070"
active_file="#eeedeb"
active_file_text="#ffffff">
<ThemeFileBrowser selected_file="#6b395a">
<space>
<ThemeSpaceGeneric back="#131311"
title="#000000"
@@ -428,13 +424,6 @@
</panelcolors>
</ThemeSpaceGeneric>
</space>
<space_list>
<ThemeSpaceListGeneric list="#3c3b37"
list_title="#95948f"
list_text="#95948f"
list_text_hi="#ffffff">
</ThemeSpaceListGeneric>
</space_list>
</ThemeFileBrowser>
</file_browser>
<nla_editor>