[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28029] trunk/blender: Fix [#21678] Crease color cannot be adjusted
Matt Ebb
matt at mke3.net
Tue Apr 6 04:36:39 CEST 2010
Revision: 28029
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28029
Author: broken
Date: 2010-04-06 04:36:37 +0200 (Tue, 06 Apr 2010)
Log Message:
-----------
Fix [#21678] Crease color cannot be adjusted
Gave edge crease a unique theme colour.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/source/blender/editors/include/UI_resources.h
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2010-04-06 02:09:21 UTC (rev 28028)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2010-04-06 02:36:37 UTC (rev 28029)
@@ -687,6 +687,8 @@
col.prop(v3d, "bone_solid")
col.prop(v3d, "bone_pose")
col.prop(v3d, "edge_seam")
+ col.prop(v3d, "edge_sharp")
+ col.prop(v3d, "edge_crease")
#col.prop(v3d, "edge") Doesn't seem to work
elif theme.theme_area == 'GRAPH_EDITOR':
Modified: trunk/blender/source/blender/editors/include/UI_resources.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_resources.h 2010-04-06 02:09:21 UTC (rev 28028)
+++ trunk/blender/source/blender/editors/include/UI_resources.h 2010-04-06 02:36:37 UTC (rev 28029)
@@ -227,6 +227,8 @@
TH_DOPESHEET_CHANNELSUBOB,
TH_PREVIEW_BACK,
+
+ TH_EDGE_CREASE,
};
/* XXX WARNING: previous is saved in file, so do not change order! */
Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c 2010-04-06 02:09:21 UTC (rev 28028)
+++ trunk/blender/source/blender/editors/interface/resources.c 2010-04-06 02:36:37 UTC (rev 28029)
@@ -275,6 +275,8 @@
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 @@
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);
}
}
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2010-04-06 02:09:21 UTC (rev 28028)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2010-04-06 02:36:37 UTC (rev 28029)
@@ -1885,7 +1885,7 @@
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;
Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2010-04-06 02:09:21 UTC (rev 28028)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2010-04-06 02:36:37 UTC (rev 28029)
@@ -192,7 +192,7 @@
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 @@
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];
Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2010-04-06 02:09:21 UTC (rev 28028)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2010-04-06 02:36:37 UTC (rev 28029)
@@ -671,6 +671,11 @@
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);
More information about the Bf-blender-cvs
mailing list