diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-07-02 15:21:06 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-07-02 15:21:06 +0400 |
| commit | 1673b56dd38b7047a7d6d00b044a38ad9b60a661 (patch) | |
| tree | 1f29d3449daf4c8ca6dc144939b2eca6d88cce62 /source | |
| parent | 7b07fcca9107cb3f2e623bc774e39eaef14ee9c6 (diff) | |
Bugfix #4565
Curves without bevel/extrude don't react to buttons to fill front/back.
That is coded that way, so added this info to the tooltip
Bug report #4566
Creases drawing became very awkward in commit in august last year. Flipped
the drawing order so the fat lines - denoting creases - are drawn first.
That way the value of crease is visible, as well as edge selection state.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/buttons_editing.c | 6 | ||||
| -rw-r--r-- | source/blender/src/drawobject.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index a52d6e30c9a..88ed339bd7f 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -2416,9 +2416,9 @@ static void editing_panel_curve_type(Object *ob, Curve *cu) uiBlockBeginAlign(block); uiBlockSetCol(block, TH_BUT_SETTING1); - uiDefButBitS(block, TOG, CU_BACK, B_MAKEDISP, "Back", 760,115,50,19, &cu->flag, 0, 0, 0, 0, "Draw filled back for curves"); - uiDefButBitS(block, TOG, CU_FRONT, B_MAKEDISP, "Front",810,115,50,19, &cu->flag, 0, 0, 0, 0, "Draw filled front for curves"); - uiDefButBitS(block, TOG, CU_3D, B_CU3D, "3D", 860,115,50,19, &cu->flag, 0, 0, 0, 0, "Allow Curve Object to be 3d, it doesn't fill then"); + uiDefButBitS(block, TOG, CU_BACK, B_MAKEDISP, "Back", 760,115,50,19, &cu->flag, 0, 0, 0, 0, "Draw filled back for extruded/beveled curves"); + uiDefButBitS(block, TOG, CU_FRONT, B_MAKEDISP, "Front",810,115,50,19, &cu->flag, 0, 0, 0, 0, "Draw filled front for extruded/beveled curves"); + uiDefButBitS(block, TOG, CU_3D, B_CU3D, "3D", 860,115,50,19, &cu->flag, 0, 0, 0, 0, "Allow Curve to be 3d, it doesn't fill then"); } } diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 71065055e86..9d990f97d16 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -1378,7 +1378,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) { - BIF_ThemeColorShade((eed->f&SELECT)?TH_EDGE_SELECT:TH_WIRE, 120*eed->crease); + BIF_ThemeColorBlend(TH_WIRE, TH_EDGE_SELECT, eed->crease); return 1; } else { return 0; @@ -1738,12 +1738,12 @@ static void draw_em_fancy(Object *ob, EditMesh *em, DerivedMesh *cageDM, Derived glLineWidth(1); } - draw_em_fancy_edges(cageDM); - if(G.f & G_DRAWCREASES) { draw_dm_creases(cageDM); } + draw_em_fancy_edges(cageDM); + if(ob==G.obedit) { draw_em_fancy_verts(em, cageDM); |