diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-12-12 21:31:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-12-12 21:31:34 +0300 |
| commit | 696ef1afd29ef31b7202a9f5589076fe1a05a00b (patch) | |
| tree | b5c5af0ffd8d2b244bdd4da6533f5b4c82e96eea | |
| parent | 6f78cdd79f4bd8229dc09a16b3c4cfb316e4c50c (diff) | |
minor changesprojection-paint
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 | ||||
| -rw-r--r-- | source/blender/src/buttons_editing.c | 4 | ||||
| -rw-r--r-- | source/blender/src/imagepaint.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 8b264602fee..f92311312fa 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -346,7 +346,7 @@ typedef struct ImagePaintSettings { struct Brush *brush; short flag, tool; - /* for projection painting only - todo - use flags */ + /* for projection painting only */ short seam_bleed,normal_angle; } ImagePaintSettings; diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index 65b992682de..c1539a46c86 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -5020,7 +5020,7 @@ void do_meshbuts(unsigned short event) if (G.obedit || me) { CustomData *fdata= (G.obedit)? &em->fdata: &me->fdata; CustomData_set_layer_mask(fdata, CD_MTFACE, acttface_mask-1); - BIF_undo_push("Set Mask UV Texture"); + BIF_undo_push("Set Stencil UV Texture"); allqueue(REDRAWBUTSEDIT, 0); } break; @@ -6393,7 +6393,7 @@ void brush_buttons(uiBlock *block, short sima, uiDefButBitS(block, TOGN|BIT, IMAGEPAINT_PROJECT_BACKFACE, B_NOP, "Cull", xco+10+butw/2,yco-45,butw/2,19, &settings->imapaint.flag, 0, 0, 0, 0, "Ignore faces pointing away from the view (faster)"); uiDefButBitS(block, TOGN|BIT, IMAGEPAINT_PROJECT_FLAT, B_NOP, "Normal", xco+10,yco-65,butw/2,19, &settings->imapaint.flag, 0, 0, 0, 0, "Paint most on faces pointing towards the view"); - uiDefButS(block, NUM, B_NOP, "", xco+10 +(butw/2),yco-65,butw/2,19, &settings->imapaint.normal_angle, 10.0, 90.0, 0, 0, "Paint most on faces pointing towards the view acording to this angle)"); + uiDefButS(block, NUM, B_NOP, "", xco+10 +(butw/2),yco-65,butw/2,19, &settings->imapaint.normal_angle, 10.0, 90.0, 0, 0, "Paint most on faces pointing towards the view acording to this angle"); uiDefButS(block, NUM, B_NOP, "Bleed: ", xco+10,yco-85,butw,19, &settings->imapaint.seam_bleed, 0.0, 8.0, 0, 0, "Extend paint beyond the faces UVs to reduce seams (in pixels, slower)"); uiBlockEndAlign(block); diff --git a/source/blender/src/imagepaint.c b/source/blender/src/imagepaint.c index 27357137d7d..96f10dbf933 100644 --- a/source/blender/src/imagepaint.c +++ b/source/blender/src/imagepaint.c @@ -65,7 +65,6 @@ #include "DNA_space_types.h" #include "DNA_userdef_types.h" #include "DNA_view3d_types.h" -#include "DNA_gpencil_types.h" #include "BKE_brush.h" #include "BKE_global.h" @@ -92,7 +91,6 @@ #include "BDR_imagepaint.h" #include "BDR_vpaint.h" -#include "BDR_gpencil.h" #include "GPU_draw.h" #include "GHOST_Types.h" @@ -4318,7 +4316,6 @@ static int imapaint_paint_sub_stroke(ImagePaintState *s, BrushPainter *painter, else return 0; } -/* this is only useful for debugging at the moment */ static void imapaint_paint_stroke(ImagePaintState *s, BrushPainter *painter, short texpaint, short *prevmval, short *mval, double time, float pressure) { Image *newimage = NULL; |