archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bug fix: Beauty Fill crashed on non-regular geometry. Pointers NULL...

Browse Source 
Also: fixed tooltips for icon buttons for Transform Widgets
This commit is contained in:
Ton Roosendaal
2005-05-13 14:10:34 +00:00
parent c7942efdba
commit ec2cbb2689
2 changed files with 78 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/src/editmesh_tools.c
View File

@@ -2256,6 +2256,7 @@ void beauty_fill(void)
if(ok) {
/* test convex */
givequadverts(efaa[0], efaa[1], &v1, &v2, &v3, &v4, uv, col);
if(v1 && v2 && v3 && v4) {
if( convex(v1->co, v2->co, v3->co, v4->co) ) {
/* test edges */
@@ -2350,6 +2351,7 @@ void beauty_fill(void)
}
}
}
}
}
eed= nexted;

8
source/blender/src/header_view3d.c
View File

@@ -4163,13 +4163,13 @@ void view3d_buttons(void)
xco+= XIC;
if(G.vd->twflag & V3D_USE_MANIPULATOR) {
uiDefIconButS(block, TOG|BIT|0, B_MAN_TRANS, ICON_MAN_TRANS, xco,0,XIC,YIC, &G.vd->twtype, 1.0, 0.0, 0, 0, "Translate widget mode (CTRL click cycles)");
uiDefIconButS(block, TOG|BIT|0, B_MAN_TRANS, ICON_MAN_TRANS, xco,0,XIC,YIC, &G.vd->twtype, 1.0, 0.0, 0, 0, "Translate widget mode (CTRL+Space)");
xco+= XIC;
uiDefIconButS(block, TOG|BIT|1, B_MAN_ROT, ICON_MAN_ROT, xco,0,XIC,YIC, &G.vd->twtype, 1.0, 0.0, 0, 0, "Rotate widget mode (CTRL click cycles)");
uiDefIconButS(block, TOG|BIT|1, B_MAN_ROT, ICON_MAN_ROT, xco,0,XIC,YIC, &G.vd->twtype, 1.0, 0.0, 0, 0, "Rotate widget mode (CTRL+Space)");
xco+= XIC;
uiDefIconButS(block, TOG|BIT|2, B_MAN_SCALE, ICON_MAN_SCALE, xco,0,XIC,YIC, &G.vd->twtype, 1.0, 0.0, 0, 0, "Scale widget mode (CTRL click cycles)");
uiDefIconButS(block, TOG|BIT|2, B_MAN_SCALE, ICON_MAN_SCALE, xco,0,XIC,YIC, &G.vd->twtype, 1.0, 0.0, 0, 0, "Scale widget mode (CTRL+Space)");
xco+= XIC;
uiDefButS(block, MENU, REDRAWVIEW3D, "Orientation%t|Global%x0|Local%x1|Normal%x2", xco,0,60,YIC, &G.vd->twmode, 0, 0, 0, 0, "Current color");
uiDefButS(block, MENU, REDRAWVIEW3D, "Orientation%t|Global%x0|Local%x1|Normal%x2", xco,0,60,YIC, &G.vd->twmode, 0, 0, 0, 0, "Widget orientation (ALT+Space)");
xco+= 60;
}
uiBlockEndAlign(block);