diff options
author | Matt Ebb <matt@mke3.net> | 2010-04-06 06:36:37 +0400 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-04-06 06:36:37 +0400 |
commit | 825c1621675b85d06f6a5a27172ed6aa3c261114 (patch) | |
tree | 26e5f2ce01152e3b938cd648ad921878a467bd91 /source | |
parent | bfe248b3d629d28fed3798e9f6a42bccb5d40f9e (diff) |
Fix [#21678] Crease color cannot be adjusted
Gave edge crease a unique theme colour.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/include/UI_resources.h | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 5 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 5 |
5 files changed, 15 insertions, 3 deletions
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 273071f94bf..13f5eb86de2 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -227,6 +227,8 @@ enum { TH_DOPESHEET_CHANNELSUBOB, TH_PREVIEW_BACK, + + TH_EDGE_CREASE, }; /* XXX WARNING: previous is saved in file, so do not change order! */ diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index dcfbc94798b..b22ef5bbe52 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -275,6 +275,8 @@ char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) cp= ts->edge_seam; break; case TH_EDGE_SHARP: cp= ts->edge_sharp; break; + case TH_EDGE_CREASE: + cp= ts->edge_crease; break; case TH_EDITMESH_ACTIVE: cp= ts->editmesh_active; break; case TH_EDGE_FACESEL: @@ -1440,6 +1442,9 @@ void init_userdef_do_versions(void) SETCOL(btheme->tipo.handle_sel_auto, 0xf0, 0xff, 0x40, 255); SETCOL(btheme->tipo.handle_sel_vect, 0x40, 0xc0, 0x30, 255); SETCOL(btheme->tipo.handle_sel_align, 0xf0, 0x90, 0xa0, 255); + + /* edge crease */ + SETCOLF(btheme->tv3d.edge_crease, 0.8, 0, 0.6, 1.0); } } diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index c5cbb080b4c..93f2f571d77 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -1885,7 +1885,7 @@ static int draw_dm_creases__setDrawOptions(void *userData, int index) EditEdge *eed = EM_get_edge_for_index(index); if (eed->h==0 && eed->crease!=0.0) { - UI_ThemeColorBlend(TH_WIRE, TH_EDGE_SELECT, eed->crease); + UI_ThemeColorBlend(TH_WIRE, TH_EDGE_CREASE, eed->crease); return 1; } else { return 0; diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index d5a2b504962..0b898e1a525 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -192,7 +192,7 @@ typedef struct ThemeSpace { char active[4], group[4], group_active[4], transform[4]; char vertex[4], vertex_select[4]; char edge[4], edge_select[4]; - char edge_seam[4], edge_sharp[4], edge_facesel[4]; + char edge_seam[4], edge_sharp[4], edge_facesel[4], edge_crease[4]; char face[4], face_select[4]; // solid faces char face_dot[4]; // selected color char normal[4]; @@ -210,7 +210,7 @@ typedef struct ThemeSpace { char console_cursor[4]; char vertex_size, facedot_size; - char bpad[6]; + char bpad[2]; char syntaxl[4], syntaxn[4], syntaxb[4]; // syntax for textwindow and nodes char syntaxv[4], syntaxc[4]; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 6b78ddaeae1..3dd90bf6f89 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -671,6 +671,11 @@ static void rna_def_userdef_theme_spaces_edge(StructRNA *srna) RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Edge Sharp", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); + + prop= RNA_def_property(srna, "edge_crease", PROP_FLOAT, PROP_COLOR); + RNA_def_property_array(prop, 3); + RNA_def_property_ui_text(prop, "Edge Crease", ""); + RNA_def_property_update(prop, 0, "rna_userdef_update"); prop= RNA_def_property(srna, "edge_facesel", PROP_FLOAT, PROP_COLOR); RNA_def_property_array(prop, 3); |