Commit: 9c71f5807ff0542c347b0c0d31da1c58ac32ea42 Author: Campbell Barton Date: Wed Jan 25 11:03:17 2023 +1100 Branches: master https://developer.blender.org/rB9c71f5807ff0542c347b0c0d31da1c58ac32ea42
Cleanup: remove unused argument, warnings =================================================================== M source/blender/blenkernel/intern/image_gpu.cc M source/blender/editors/gpencil/gpencil_fill.c M source/blender/python/mathutils/mathutils_Vector.c =================================================================== diff --git a/source/blender/blenkernel/intern/image_gpu.cc b/source/blender/blenkernel/intern/image_gpu.cc index 12f3287ef97..c9d34800227 100644 --- a/source/blender/blenkernel/intern/image_gpu.cc +++ b/source/blender/blenkernel/intern/image_gpu.cc @@ -264,7 +264,7 @@ static GPUTexture **get_image_gpu_texture_ptr(Image *ima, eGPUTextureTarget textarget, const int multiview_eye) { - const bool in_range = (textarget >= 0) && (textarget < TEXTARGET_COUNT); + const bool in_range = (int(textarget) >= 0) && (textarget < TEXTARGET_COUNT); BLI_assert(in_range); BLI_assert(ELEM(multiview_eye, 0, 1)); diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index 8a7e1c03e66..058cc417cc0 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -288,8 +288,7 @@ static void add_stroke_extension(bGPDframe *gpf, bGPDstroke *gps, float p1[3], f pt->pressure = 1.0f; } -static void add_endpoint_radius_help(tGPDfill *tgpf, - bGPDframe *gpf, +static void add_endpoint_radius_help(bGPDframe *gpf, bGPDstroke *gps, const float endpoint[3], const float radius, @@ -834,8 +833,8 @@ static void gpencil_create_extensions_radius(tGPDfill *tgpf) bool start_connected = BLI_gset_haskey(connected_endpoints, stroke1_start); bool end_connected = BLI_gset_haskey(connected_endpoints, stroke1_end); - add_endpoint_radius_help(tgpf, gpf, gps, stroke1_start, connection_dist, start_connected); - add_endpoint_radius_help(tgpf, gpf, gps, stroke1_end, connection_dist, end_connected); + add_endpoint_radius_help(gpf, gps, stroke1_start, connection_dist, start_connected); + add_endpoint_radius_help(gpf, gps, stroke1_end, connection_dist, end_connected); } BLI_gset_free(connected_endpoints, NULL); diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c index c5a002a6058..d01c3d8587c 100644 --- a/source/blender/python/mathutils/mathutils_Vector.c +++ b/source/blender/python/mathutils/mathutils_Vector.c @@ -2681,8 +2681,8 @@ static int Vector_swizzle_set(VectorObject *self, PyObject *value, void *closure size_from = axis_from; } else if ((void)PyErr_Clear(), /* run but ignore the result */ - (size_from = mathutils_array_parse( - vec_assign, 2, 4, value, "mathutils.Vector.**** = swizzle assignment")) == -1) { + (size_from = (size_t)mathutils_array_parse( + vec_assign, 2, 4, value, "Vector.**** = swizzle assignment")) == (size_t)-1) { return -1; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs