diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /release/scripts/presets/interface_theme/ubuntu_ambiance.xml | |
parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'release/scripts/presets/interface_theme/ubuntu_ambiance.xml')
-rw-r--r-- | release/scripts/presets/interface_theme/ubuntu_ambiance.xml | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml index e702e25bc86..b2743f36c02 100644 --- a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml +++ b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml @@ -5,6 +5,7 @@ menu_shadow_width="12" icon_file="" icon_alpha="1" + widget_emboss="#ffffff05" axis_x="#dc0000" axis_y="#00dc00" axis_z="#0000dc"> @@ -433,18 +434,18 @@ <nla_editor> <ThemeNLAEditor grid="#5c5c52" view_sliders="#969696" - active_action="#00000000" - active_action_unset="#00000000" + active_action="#cc701a66" + active_action_unset="#9987614d" strips="#0c0a0a" strips_selected="#6b395a" - transition_strips="#000000" - transition_strips_selected="#000000" - meta_strips="#000000" - meta_strips_selected="#000000" - sound_strips="#000000" - sound_strips_selected="#000000" - tweak="#000000" - tweak_duplicate="#000000" + transition_strips="#1c2630" + transition_strips_selected="#2e75db" + meta_strips="#332642" + meta_strips_selected="#692196" + sound_strips="#2b3d3d" + sound_strips_selected="#1f7a7a" + tweak="#4df31a" + tweak_duplicate="#d90000" keyframe_border="#000000ff" keyframe_border_selected="#000000ff" frame_current="#f58032"> @@ -505,7 +506,7 @@ keyframe_jitter_selected="#61c042" keyframe_border="#000000ff" keyframe_border_selected="#000000ff" - summary="#00000000"> + summary="#cc701a66"> <space> <ThemeSpaceGeneric back="#131311" title="#9c9c9c" @@ -747,6 +748,7 @@ <ThemeNodeEditor node_selected="#ffffff" node_active="#ffffff" wire="#f45b00" + wire_inner="#737373" wire_select="#f4b696" selected_text="#7f7070" node_backdrop="#52524ed1" @@ -970,7 +972,6 @@ locked_marker="#7f7f7f" path_before="#ff5100" path_after="#19b6ee" - grid="#302e2c" frame_current="#f47421" strips="#0c0a0a" strips_selected="#ff8c00" |