[Bf-blender-cvs] [3254a63218d] master: Cleanup: correct array size in argument

Campbell Barton noreply at git.blender.org
Mon Jan 4 07:41:52 CET 2021


Commit: 3254a63218dd0ace82bca0b578ee74827bf2fa6d
Author: Campbell Barton
Date:   Mon Jan 4 16:16:04 2021 +1100
Branches: master
https://developer.blender.org/rB3254a63218dd0ace82bca0b578ee74827bf2fa6d

Cleanup: correct array size in argument

===================================================================

M	source/blender/editors/sculpt_paint/paint_image_proj.c
M	source/blender/editors/space_view3d/view3d_placement.c
M	source/blender/python/bmesh/bmesh_py_types_meshdata.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 087e9128149..6e6386b24aa 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -2210,7 +2210,7 @@ static bool line_clip_rect2f(const rctf *cliprect,
  */
 #ifndef PROJ_DEBUG_NOSEAMBLEED
 
-static void scale_tri(float insetCos[3][3], const float *origCos[4], const float inset)
+static void scale_tri(float insetCos[3][3], const float *origCos[3], const float inset)
 {
   float cent[3];
   cent[0] = (origCos[0][0] + origCos[1][0] + origCos[2][0]) * (1.0f / 3.0f);
diff --git a/source/blender/editors/space_view3d/view3d_placement.c b/source/blender/editors/space_view3d/view3d_placement.c
index bd71a768c0f..810693f4bff 100644
--- a/source/blender/editors/space_view3d/view3d_placement.c
+++ b/source/blender/editors/space_view3d/view3d_placement.c
@@ -594,10 +594,10 @@ static bool calc_bbox(struct InteractivePlaceData *ipd, BoundBox *bounds)
   return true;
 }
 
-static void draw_circle_in_quad(const float v1[2],
-                                const float v2[2],
-                                const float v3[2],
-                                const float v4[2],
+static void draw_circle_in_quad(const float v1[3],
+                                const float v2[3],
+                                const float v3[3],
+                                const float v4[3],
                                 const int resolution,
                                 const float color[4])
 {
diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c
index c43e5bb4d97..127ce7db503 100644
--- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c
+++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c
@@ -272,12 +272,12 @@ PyObject *BPy_BMVertSkin_CreatePyObject(struct MVertSkin *mvertskin)
 #define MLOOPCOL_FROM_CAPSULE(color_capsule) \
   ((MLoopCol *)PyCapsule_GetPointer(color_capsule, NULL))
 
-static void mloopcol_to_float(const MLoopCol *mloopcol, float r_col[3])
+static void mloopcol_to_float(const MLoopCol *mloopcol, float r_col[4])
 {
   rgba_uchar_to_float(r_col, (const uchar *)&mloopcol->r);
 }
 
-static void mloopcol_from_float(MLoopCol *mloopcol, const float col[3])
+static void mloopcol_from_float(MLoopCol *mloopcol, const float col[4])
 {
   rgba_float_to_uchar((uchar *)&mloopcol->r, col);
 }



More information about the Bf-blender-cvs mailing list