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 | |
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')
7 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h index 17c69d22337..0df4de1f829 100644 --- a/source/blender/blenlib/BLI_math_vector.h +++ b/source/blender/blenlib/BLI_math_vector.h @@ -149,14 +149,14 @@ MINLINE void star_m3_v3(float rmat[3][3], float a[3]); MINLINE float len_squared_v2(const float v[2]); MINLINE float len_squared_v3(const float v[3]); MINLINE float len_manhattan_v2(const float v[2]); -MINLINE float len_manhattan_v2_int(const int v[2]); +MINLINE int len_manhattan_v2_int(const int v[2]); MINLINE float len_manhattan_v3(const float v[3]); MINLINE float len_v2(const float a[2]); MINLINE float len_v2v2(const float a[2], const float b[2]); MINLINE float len_squared_v2v2(const float a[2], const float b[2]); MINLINE float len_squared_v3v3(const float a[3], const float b[3]); MINLINE float len_manhattan_v2v2(const float a[2], const float b[2]); -MINLINE float len_manhattan_v2v2_int(const int a[2], const int b[2]); +MINLINE int len_manhattan_v2v2_int(const int a[2], const int b[2]); MINLINE float len_manhattan_v3v3(const float a[3], const float b[3]); MINLINE float len_v3(const float a[3]); MINLINE float len_v3v3(const float a[3], const float b[3]); diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c index 216057f79c5..d77b1ecf017 100644 --- a/source/blender/blenlib/intern/math_vector_inline.c +++ b/source/blender/blenlib/intern/math_vector_inline.c @@ -594,7 +594,7 @@ MINLINE float len_manhattan_v2(const float v[2]) return fabsf(v[0]) + fabsf(v[1]); } -MINLINE float len_manhattan_v2_int(const int v[2]) +MINLINE int len_manhattan_v2_int(const int v[2]) { return ABS(v[0]) + ABS(v[1]); } @@ -647,7 +647,7 @@ MINLINE float len_manhattan_v2v2(const float a[2], const float b[2]) return len_manhattan_v2(d); } -MINLINE float len_manhattan_v2v2_int(const int a[2], const int b[2]) +MINLINE int len_manhattan_v2v2_int(const int a[2], const int b[2]) { int d[2]; diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index a0df8fd1934..6f3f0074f2e 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -71,7 +71,7 @@ void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering, BKE_node_preview_init_tree(editingtree, COM_PREVIEW_SIZE, (int)(COM_PREVIEW_SIZE * aspect), FALSE); /* initialize workscheduler, will check if already done. TODO deinitialize somewhere */ - bool use_opencl = (editingtree->flag & NTREE_COM_OPENCL); + bool use_opencl = (editingtree->flag & NTREE_COM_OPENCL) != 0; WorkScheduler::initialize(use_opencl); /* set progress bar to 0% and status to init compositing */ diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp index e4dd72d79e9..b8d9841c92a 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cpp +++ b/source/blender/compositor/nodes/COM_ImageNode.cpp @@ -73,7 +73,7 @@ void ImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c ImageUser *imageuser = (ImageUser *)editorNode->storage; int framenumber = context->getFramenumber(); int numberOfOutputs = this->getNumberOfOutputSockets(); - bool outputStraightAlpha = editorNode->custom1 & CMP_NODE_IMAGE_USE_STRAIGHT_OUTPUT; + bool outputStraightAlpha = (editorNode->custom1 & CMP_NODE_IMAGE_USE_STRAIGHT_OUTPUT) != 0; BKE_image_user_frame_calc(imageuser, context->getFramenumber(), 0); /* force a load, we assume iuser index will be set OK anyway */ 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) { |