[Bf-blender-cvs] [5e9502d8f01] temp-greasepencil-vfx: Merge branch 'greasepencil-object' into temp-greasepencil-vfx
Antonio Vazquez
noreply at git.blender.org
Wed Jun 27 22:48:22 CEST 2018
Commit: 5e9502d8f01b95d1bee1ea7795cccd9bb93f947a
Author: Antonio Vazquez
Date: Wed Jun 27 22:46:27 2018 +0200
Branches: temp-greasepencil-vfx
https://developer.blender.org/rB5e9502d8f01b95d1bee1ea7795cccd9bb93f947a
Merge branch 'greasepencil-object' into temp-greasepencil-vfx
===================================================================
===================================================================
diff --cc release/datafiles/userdef/userdef_default_theme.c
index 4506d23b49d,ba263628558..6d429986aa1
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@@ -19,1930 -19,1930 +19,3857 @@@
const bTheme U_theme_default = {
.name = "Default",
.tui = {
++<<<<<<< HEAD
+ .wcol_regular = {
+ .outline = RGBA(0x38393e00),
+ .inner = RGBA(0x505158ff),
+ .inner_sel = RGBA(0x80858aff),
+ .item = RGBA(0x38393eff),
+ .text = RGBA(0xebebebff),
+ .text_sel = RGBA(0xffffffff),
+ .shadedown = -5,
+ .roundness = 0.2f,
+ },
+ .wcol_tool = {
+ .outline = RGBA(0x2f2f3400),
+ .inner = RGBA(0x505158ff),
+ .inner_sel = RGBA(0x2f2f34ff),
+ .item = RGBA(0xe6ebffff),
+ .text = RGBA(0xf2f2f2ff),
+ .text_sel = RGBA(0xffffffff),
+ .shadedown = -5,
+ .roundness = 0.2f,
+ },
+ .wcol_toolbar_item = {
+ .outline = RGBA(0x19191900),
+ .inner = RGBA(0x505158ff),
+ .inner_sel = RGBA(0x2d2d33ff),
+ .item = RGBA(0x191919ff),
+ .text = RGBA(0xffffffff),
+ .text_sel = RGBA(0xffffffff),
+ .roundness = 0.25f,
+ },
+ .wcol_text = {
+ .outline = RGBA(0x43454d00),
+ .inner = RGBA(0x2d2e33ff),
+ .inner_sel = RGBA(0x717280ff),
+ .item = RGBA(0x599eb3ff),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xffffffff),
+ .shaded = 1,
+ .shadetop = -3,
+ .roundness = 0.2f,
+ },
+ .wcol_radio = {
+ .outline = RGBA(0x42435200),
+ .inner = RGBA(0x505158ff),
+ .inner_sel = RGBA(0x2d2d33ff),
+ .item = RGBA(0xffffffff),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xffffffff),
+ .shadetop = 5,
+ .shadedown = -5,
+ .roundness = 0.2f,
+ },
+ .wcol_option = {
+ .outline = RGBA(0x42435200),
+ .inner = RGBA(0x5c5c66cc),
+ .inner_sel = RGBA(0x70707cff),
+ .item = RGBA(0xffffffff),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xffffffff),
+ .shadedown = -15,
+ .roundness = 0.25f,
+ },
+ .wcol_toggle = {
+ .outline = RGBA(0x43434d00),
+ .inner = RGBA(0x595966ff),
+ .inner_sel = RGBA(0x3f7d80ff),
+ .item = RGBA(0x191919ff),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xffffffff),
+ .roundness = 0.25f,
+ },
+ .wcol_num = {
+ .outline = RGBA(0x46464d00),
+ .inner = RGBA(0x505158ff),
+ .inner_sel = RGBA(0x3f7780ff),
+ .item = RGBA(0x46464dff),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xffffffff),
+ .shaded = 1,
+ .roundness = 0.3f,
+ },
+ .wcol_numslider = {
+ .outline = RGBA(0x46464d00),
+ .inner = RGBA(0x3f3f47ff),
+ .inner_sel = RGBA(0x3f7780ff),
+ .item = RGBA(0x505158ff),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xffffffff),
+ .shaded = 1,
+ .shadetop = -4,
+ .roundness = 0.4f,
+ },
+ .wcol_tab = {
+ .outline = RGBA(0x28292d00),
+ .inner = RGBA(0x323239ff),
+ .inner_sel = RGBA(0x43444bff),
+ .item = RGBA(0x28292dff),
+ .text = RGBA(0xbebebeff),
+ .text_sel = RGBA(0xffffffff),
+ .roundness = 0.15f,
+ },
+ .wcol_menu = {
+ .outline = RGBA(0x43454d00),
+ .inner = RGBA(0x29282eff),
+ .inner_sel = RGBA(0x505158ff),
+ .item = RGBA(0xe6e6e6ff),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xccccccff),
+ .shadetop = 10,
+ .shadedown = -10,
+ .roundness = 0.2f,
+ },
+ .wcol_pulldown = {
+ .outline = RGBA(0x43454d00),
+ .inner = RGBA(0x29282e99),
+ .inner_sel = RGBA(0x505158ff),
+ .item = RGBA(0x696a72ff),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xffffffff),
+ .shadetop = 25,
+ .shadedown = -20,
+ .roundness = 0.2f,
+ },
+ .wcol_menu_back = {
+ .outline = RGBA(0x29282e00),
+ .inner = RGBA(0x1f1f1fef),
+ .inner_sel = RGBA(0x505158ff),
+ .item = RGBA(0x696a72ff),
+ .text = RGBA(0xb3b3b3ff),
+ .text_sel = RGBA(0xffffffff),
+ .shadetop = 25,
+ .shadedown = -20,
+ .roundness = 0.25f,
+ },
+ .wcol_menu_item = {
+ .inner_sel = RGBA(0x505158ff),
+ .item = RGBA(0xacacac80),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xffffffff),
+ .shadetop = 38,
+ .roundness = 0.25f,
+ },
+ .wcol_tooltip = {
+ .outline = RGBA(0x2f303500),
+ .inner = RGBA(0x19191aef),
+ .inner_sel = RGBA(0x19191aef),
+ .item = RGBA(0x19191aef),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xffffffff),
+ .shadetop = 25,
+ .shadedown = -20,
+ .roundness = 0.25f,
+ },
+ .wcol_box = {
+ .outline = RGBA(0x2d2e3300),
+ .inner = RGBA(0x43454dff),
+ .inner_sel = RGBA(0x3f7780ff),
+ .item = RGBA(0x191919ff),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xffffffff),
+ .roundness = 0.2f,
+ },
+ .wcol_scroll = {
+ .outline = RGBA(0x2f303500),
+ .inner = RGBA(0x585a6700),
+ .inner_sel = RGBA(0x599eb3ff),
+ .item = RGBA(0x585a67ff),
+ .text = RGBA(0xffffffff),
+ .text_sel = RGBA(0xffffffff),
+ .shadetop = 5,
+ .shadedown = -5,
+ .roundness = 0.5f,
+ },
+ .wcol_progress = {
+ .outline = RGBA(0xb3b3b300),
+ .inner = RGBA(0xccccccff),
+ .inner_sel = RGBA(0x646464b4),
+ .item = RGBA(0x599eb3ff),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xffffffff),
+ .roundness = 0.25f,
+ },
+ .wcol_list_item = {
+ .outline = RGBA(0x28292d00),
+ .inner = RGBA(0x28292d00),
+ .inner_sel = RGBA(0x5f616fff),
+ .item = RGBA(0x599eb3ff),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xffffffff),
+ .roundness = 0.2f,
+ },
+ .wcol_pie_menu = {
+ .outline = RGBA(0x29282e00),
+ .inner = RGBA(0x29282eff),
+ .inner_sel = RGBA(0x505158ff),
+ .item = RGBA(0x696a72ff),
+ .text = RGBA(0xeeeeeeff),
+ .text_sel = RGBA(0xffffffff),
+ .shadetop = 10,
+ .shadedown = -10,
+ .roundness = 0.5f,
+ },
+ .wcol_state = {
+ .inner_anim = RGBA(0x73be4c00),
+ .inner_anim_sel = RGBA(0x5aa633ff),
+ .inner_key = RGBA(0xf0eb64ff),
+ .inner_key_sel = RGBA(0xd7d34bff),
+ .inner_driven = RGBA(0xb400ffff),
+ .inner_driven_sel = RGBA(0x9900e6ff),
+ .blend = 0.5f,
+ },
+ .panel = {
+ .back = RGBA(0x72727280),
+ },
+ .widget_emboss = RGBA(0x00000005),
+ .menu_shadow_fac = 0.3f,
+ .menu_shadow_width = 4,
+ .editor_outline = RGBA(0x1c1d20ff),
+ .icon_alpha = 1.0f,
+ .icon_saturation = 0.4f,
+ .xaxis = RGBA(0xff3352ff),
+ .yaxis = RGBA(0x8bdc00ff),
+ .zaxis = RGBA(0x2890ffff),
+ .manipulator_hi = RGBA(0xffffffff),
+ .manipulator_primary = RGBA(0xf5f14dff),
+ .manipulator_secondary = RGBA(0x63ffffff),
+ .manipulator_a = RGBA(0x4da84dff),
+ .manipulator_b = RGBA(0xa33535ff),
+ },
+ .tbuts = {
+ .back = RGBA(0x3a3c4200),
+ .title = RGBA(0xeeeeeeff),
+ .text = RGBA(0xffffffff),
+ .text_hi = RGBA(0xffffffff),
+ .header = RGBA(0x3a3c42ff),
+ .header_title = RGBA(0x000000ff),
+ .header_text = RGBA(0xeeeeeeff),
+ .header_text_hi = RGBA(0xffffffff),
+ .tab_active = RGBA(0x43444bff),
+ .tab_inactive = RGBA(0x323239ff),
+ .tab_back = RGBA(0x1f1f23ff),
+ .tab_outline = RGBA(0x28292dff),
+ .button = RGBA(0x2f303599),
+ .button_title = RGBA(0xffffffff),
+ .button_text = RGBA(0xffffffff),
+ .button_text_hi = RGBA(0xffffffff),
+ .list = RGBA(0xa5a5a5ff),
+ .list_title = RGBA(0x000000ff),
+ .list_text = RGBA(0x000000ff),
+ .list_text_hi = RGBA(0xffffffff),
+ .panelcolors = {
+ .header = RGBA(0x3a3c42cc),
+ .back = RGBA(0x2c2e33b3),
+ .sub_back = RGBA(0x0000003e),
+ .show_header = 1,
+ .show_back = 1,
+ },
+ .shade2 = RGBA(0x7f707064),
+ .grid = RGBA(0x404040ff),
+ .wire = RGBA(0x000000ff),
+ .select = RGBA(0xf15800ff),
+ .lamp = RGBA(0x00000028),
+ .speaker = RGBA(0x000000ff),
+ .empty = RGBA(0x000000ff),
+ .camera = RGBA(0x000000ff),
+ .active = RGBA(0xffaa40ff),
+ .group = RGBA(0x083008ff),
+ .group_active = RGBA(0x55bb55ff),
+ .transform = RGBA(0xffffffff),
+ .vertex = RGBA(0x000000ff),
+ .vertex_select = RGBA(0xff8500ff),
+ .edge = RGBA(0x000000ff),
+ .edge_select = RGBA(0xffa000ff),
+ .edge_seam = RGBA(0xdb2512ff),
+ .edge_sharp = RGBA(0x00ffffff),
+ .edge_facesel = RGBA(0x4b4b4bff),
+ .edge_crease = RGBA(0xcc0099ff),
+ .face = RGBA(0x00000012),
+ .face_select = RGBA(0xff85003c),
+ .face_dot = RGBA(0xff8500ff),
+ .extra_edge_len = RGBA(0x200000ff),
+ .extra_face_angle = RGBA(0x000080ff),
+ .extra_face_area = RGBA(0x002000ff),
+ .normal = RGBA(0x22ddddff),
+ .vertex_normal = RGBA(0x2361ddff),
+ .bone_solid = RGBA(0xc8c8c8ff),
+ .bone_pose = RGBA(0x50c8ff50),
+ .bone_pose_active = RGBA(0x8cffff50),
+ .cframe = RGBA(0x60c040ff),
+ .nurb_uline = RGBA(0x909000ff),
+ .nurb_vline = RGBA(0x803060ff),
+ .act_spline = RGBA(0xdb2512ff),
+ .nurb_sel_uline = RGBA(0xf0ff40ff),
+ .nurb_sel_vline = RGBA(0xf090a0ff),
+ .lastsel_point = RGBA(0xffffffff),
+ .handle_free = RGBA(0x000000ff),
+ .handle_auto = RGBA(0x909000ff),
+ .handle_vect = RGBA(0x409030ff),
+ .handle_align = RGBA(0x803060ff),
+ .handle_sel_free = RGBA(0x000000ff),
+ .handle_sel_auto = RGBA(0xf0ff40ff),
+ .handle_sel_vect = RGBA(0x40c030ff),
+ .handle_sel_align = RGBA(0xf090a0ff),
+ .vertex_size = 3,
+ .outline_width = 1,
+ .facedot_size = 4,
+ .editmesh_active = RGBA(0xffffff80),
+ .bundle_solid = RGBA(0xc8c8c8ff),
+ .camera_path = RGBA(0x000000ff),
+ .skin_root = RGBA(0xb44d4dff),
+ },
+ .tv3d = {
+ .title = RGBA(0xeeeeeeff),
+ .text = RGBA(0xffffffff),
+ .text_hi = RGBA(0xffffffff),
+ .header = RGBA(0x3a3c4200),
+ .header_title = RGBA(0x000000ff),
+ .header_text = RGBA(0xeeeeeeff),
+ .header_text_hi = RGBA(0xffffffff),
+ .tab_active = RGBA(0x43444bff),
+ .tab_inactive = RGBA(0x323239ff),
+ .tab_back = RGBA(0x1f1f23ff),
+ .tab_outline = RGBA(0x28292dff),
+ .button = RGBA(0x2f303500),
+ .button_title = RGBA(0xffffffff),
+ .button_text = RGBA(0xffffffff),
+ .button_text_hi = RGBA(0xffffffff),
+ .list = RGBA(0xa5a5a5ff),
+ .list_title = RGBA(0x000000ff),
+ .list_text = RGBA(0x000000ff),
+ .list_text_hi = RGBA(0xffffffff),
+ .panelcolors = {
+ .header = RGBA(0x3a3c42cc),
+ .back = RGBA(0x2c2e33b3),
+ .sub_back = RGBA(0x0000003e),
+ .show_header = 1,
+ .show_back = 1,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list