diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-09-28 00:41:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-09-28 00:41:56 +0400 |
| commit | 18bd726f0b040f00ba64bf4c4106deea872201a9 (patch) | |
| tree | f321c19f0c0ed7b93e2e971803e5daac1af082e5 /source/blender/src/header_view3d.c | |
| parent | 0345b3b221568d9c29665397ef42496c8199a05e (diff) | |
bugfix from 11860, the derived mesh was getting free'd twice (crashed
editmode + linked-dupes + texture-drawtype)
Also fixed own bug with face mode setting (wasnt checking for texface)
Diffstat (limited to 'source/blender/src/header_view3d.c')
| -rw-r--r-- | source/blender/src/header_view3d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index 3f27fe1a5ad..bd708e0aac2 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -2768,7 +2768,7 @@ static uiBlock *view3d_edit_mesh_facesmenu(void *arg_unused) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Convert Quads to Triangles|Ctrl T", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Convert Triangles to Quads|Alt J", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Flip Triangle Edges|Ctrl F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Flip Triangle Edges|Ctrl Shift F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); |