diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-13 21:11:09 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-13 21:11:09 +0400 |
| commit | 8b2c5e693c134cc5eb7d9a2da4f5d40cc06636ec (patch) | |
| tree | 7b0888adc1ddd73d4222da5a1aa9377772adc70e /source/blender/editors/sculpt_paint | |
| parent | bb61b4628039c0d3162182801666ac0df99e6165 (diff) | |
Fix #35634: weight paint did not do z-buffer culling anymore on Windows after recent change to size of bool.
Diffstat (limited to 'source/blender/editors/sculpt_paint')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 054303eef82..fcf00d4ab2c 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -523,7 +523,7 @@ static void paint_stroke_update_step(bContext *C, struct PaintStroke *stroke, Po Brush *brush = BKE_paint_brush(&scene->toolsettings->imapaint.paint); /* initial brush values. Maybe it should be considered moving these to stroke system */ - float startsize = BKE_brush_size_get(scene, brush); + float startsize = (float)BKE_brush_size_get(scene, brush); float startalpha = BKE_brush_alpha_get(scene, brush); float mouse[2]; diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 3fdbe58ddc0..7f47657c3ff 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -3525,7 +3525,7 @@ static void do_projectpaint_clone(ProjPaintState *ps, ProjPixel *projPixel, floa clone_rgba[0] = clone_pt[0]; clone_rgba[1] = clone_pt[1]; clone_rgba[2] = clone_pt[2]; - clone_rgba[3] = clone_pt[3] * mask; + clone_rgba[3] = (unsigned char)(clone_pt[3] * mask); if (ps->do_masking) { IMB_blend_color_byte(projPixel->pixel.ch_pt, projPixel->origColor.ch, clone_rgba, ps->blend); diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 4665b82eb5a..1ff7df3b041 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -2346,7 +2346,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0; use_face_sel = (me->editflag & ME_EDIT_PAINT_FACE_SEL) != 0; - use_depth = (vc->v3d->flag & V3D_ZBUF_SELECT); + use_depth = (vc->v3d->flag & V3D_ZBUF_SELECT) != 0; /* which faces are involved */ if (use_depth) { |