diff options
| author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
|---|---|---|
| committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
| commit | 2658a3c1b44717f497f187a38000c804eb37bbba (patch) | |
| tree | ee55c673feabced8b6ec8bf9a8aa4d82a3cda3db /release/scripts/presets/interface_theme/back_to_black.xml | |
| parent | 4005cb1c6a63a217df0e887c741beee2c1359301 (diff) | |
| parent | 09b859d03f0ee138c4273ef8460e91d9888387a1 (diff) | |
Merge branch 'master' into soc-2013-sketch_meshsoc-2013-sketch_mesh
Conflicts:
release/scripts/addons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
Diffstat (limited to 'release/scripts/presets/interface_theme/back_to_black.xml')
| -rw-r--r-- | release/scripts/presets/interface_theme/back_to_black.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/release/scripts/presets/interface_theme/back_to_black.xml b/release/scripts/presets/interface_theme/back_to_black.xml index 89147c1c210..4244ebb283b 100644 --- a/release/scripts/presets/interface_theme/back_to_black.xml +++ b/release/scripts/presets/interface_theme/back_to_black.xml @@ -496,6 +496,8 @@ vertex_select="#ff8500" vertex_size="3" vertex_unreferenced="#000000" + wire_edit="#C0C0C0" + edge_select="#FF8500" face="#ffffff0a" face_select="#ff85003c" face_dot="#ff8500" @@ -663,9 +665,17 @@ wire_select="#0019ff" selected_text="#7f7070" node_backdrop="#202030bc" - in_out_node="#273053" + input_node="#273053" + output_node="#273053" converter_node="#113941" - operator_node="#0e3157" + color_node="#0e3157" + filter_node="#0e3157" + vector_node="#0e3157" + texture_node="#0e3157" + shader_node="#0e3157" + script_node="#0e3157" + pattern_node="#0e3157" + layout_node="#0e3157" group_node="#091a07" group_socket_node="#dfca35" frame_node="#9a9b9ba0" |