diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-10-20 20:17:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-10-20 20:17:27 +0400 |
| commit | 46deddcc62784dab47b1f14dda0d802f5f341b18 (patch) | |
| tree | e3542a1b2d10f1c77e4ac5f7078f485d5b4e1006 /source/blender/src/editmesh_tools.c | |
| parent | e5a9e0b12a6d6aa334561edaf8a839f3f1a8d7d4 (diff) | |
Image Stamping patch by Diego (and peach request)- stamps image info into metadata and optionally
draws into the
frame.
This patch includes some changes I made...
* use blenders bitmap fonts (rather then own fonts)
* select font size
* user interface layout changes
* Marker as another image stamp option
Also added some new API calls
BMF_GetFontHeight(font);
BMF_DrawStringBuf(...); - so we can draw text into an imbuf's image buffer.
get_frame_marker(frame) - get the last marker from the frame.
IMB_rectfill_area(...) - fill in an image buffer with a rectangle area of color.
TODO - draw stamp info in 3d view, at the moment it just displays in the animation.
Diffstat (limited to 'source/blender/src/editmesh_tools.c')
| -rw-r--r-- | source/blender/src/editmesh_tools.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index 56db0ea7016..a68fca3b294 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -198,10 +198,10 @@ void convert_to_triface(int direction) int removedoublesflag(short flag, short automerge, float limit) /* return amount */ { /* - flag - Test with vert->flags - weld - Alternative operation, merge unselected into selected. - Used for "Auto Weld" mode. warning. - limit - Quick manhattan distance between verts. + flag - Test with vert->flags + automerge - Alternative operation, merge unselected into selected. + Used for "Auto Weld" mode. warning. + limit - Quick manhattan distance between verts. */ EditMesh *em = G.editMesh; @@ -211,7 +211,6 @@ int removedoublesflag(short flag, short automerge, float limit) /* return amoun EditFace *efa, *nextvl; xvertsort *sortblock, *sb, *sb1; struct facesort *vlsortblock, *vsb, *vsb1; - float dist; int a, b, test, amount; if(multires_test()) return 0; @@ -253,7 +252,7 @@ int removedoublesflag(short flag, short automerge, float limit) /* return amoun for(b=a+1; b<amount && (eve->f & 128)==0; b++, sb1++) { if(sb1->x - sb->x > limit) break; - /* when welding, only allow selected-> unselected*/ + /* when automarge, only allow unselected->selected */ v1= sb1->v1; if( (v1->f & 128)==0 ) { if ((eve->f & flag)==0 && (v1->f & flag)==1) { |