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 | |
| 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')
5 files changed, 60 insertions, 10 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" diff --git a/release/scripts/presets/interface_theme/blender_24x.xml b/release/scripts/presets/interface_theme/blender_24x.xml index cedeeac38e6..def6f52425a 100644 --- a/release/scripts/presets/interface_theme/blender_24x.xml +++ b/release/scripts/presets/interface_theme/blender_24x.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="#ffffff" selected_text="#7f7070" node_backdrop="#9b9b9ba0" - in_out_node="#646464" + input_node="#646464" + output_node="#646464" + color_node="#6c696f" + filter_node="#6c696f" + vector_node="#6c696f" + texture_node="#6c696f" + shader_node="#6c696f" + script_node="#6c696f" + pattern_node="#6c696f" + layout_node="#6c696f" converter_node="#686a75" - operator_node="#6c696f" group_node="#69756e" group_socket_node="#dfca35" frame_node="#9a9b9ba0" diff --git a/release/scripts/presets/interface_theme/elsyiun.xml b/release/scripts/presets/interface_theme/elsyiun.xml index 60de59e2e10..498eca237f4 100644 --- a/release/scripts/presets/interface_theme/elsyiun.xml +++ b/release/scripts/presets/interface_theme/elsyiun.xml @@ -496,6 +496,8 @@ vertex_select="#be6925" vertex_size="3" vertex_unreferenced="#000000" + wire_edit="#C0C0C0" + edge_select="#FF8500" face="#a47c5b0a" face_select="#a47c5b3c" face_dot="#ffffff" @@ -663,9 +665,17 @@ wire_select="#ffffff" selected_text="#7f7070" node_backdrop="#9b9b9ba0" - in_out_node="#e08706" converter_node="#575675" - operator_node="#2c6f6f" + input_node="#e08706" + output_node="#e08706" + color_node="#2c6f6f" + filter_node="#2c6f6f" + vector_node="#2c6f6f" + texture_node="#2c6f6f" + shader_node="#2c6f6f" + script_node="#2c6f6f" + pattern_node="#2c6f6f" + layout_node="#2c6f6f" group_node="#1e7524" group_socket_node="#dfca35" frame_node="#9a9b9ba0" diff --git a/release/scripts/presets/interface_theme/hexagon.xml b/release/scripts/presets/interface_theme/hexagon.xml index 277215ac831..404cbd82f5c 100644 --- a/release/scripts/presets/interface_theme/hexagon.xml +++ b/release/scripts/presets/interface_theme/hexagon.xml @@ -496,6 +496,8 @@ vertex_select="#50c8ff" vertex_size="3" vertex_unreferenced="#000000" + wire_edit="#C0C0C0" + edge_select="#FF8500" face="#ffffff0a" face_select="#50c8ff3c" face_dot="#50c8ff" @@ -663,9 +665,17 @@ wire_select="#ffffff" selected_text="#7f7070" node_backdrop="#9b9baca0" - in_out_node="#64647b" converter_node="#686a84" - operator_node="#6c697e" + input_node="#64647b" + output_node="#64647b" + color_node="#6c697e" + filter_node="#6c697e" + vector_node="#6c697e" + texture_node="#6c697e" + shader_node="#6c697e" + script_node="#6c697e" + pattern_node="#6c697e" + layout_node="#6c697e" group_node="#69756e" group_socket_node="#dfca35" frame_node="#9a9b9ba0" diff --git a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml index 0b01d42f65a..b21a4f7c933 100644 --- a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml +++ b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml @@ -496,6 +496,8 @@ vertex_select="#f47421" vertex_size="3" vertex_unreferenced="#000000" + wire_edit="#C0C0C0" + edge_select="#FF8500" face="#ffffff0a" face_select="#ff85003c" face_dot="#f47421" @@ -663,9 +665,17 @@ wire_select="#f4b696" selected_text="#7f7070" node_backdrop="#52524ed1" - in_out_node="#f40051" converter_node="#93be00" - operator_node="#000000" + input_node="#f40051" + output_node="#f40051" + color_node="#000000" + filter_node="#000000" + vector_node="#000000" + texture_node="#000000" + shader_node="#000000" + script_node="#000000" + pattern_node="#000000" + layout_node="#000000" group_node="#19b6ee" group_socket_node="#dfca35" frame_node="#9a9b9ba0" |