[Bf-blender-cvs] [86be1307a63] soc-2021-curves: Fixed build warning
dilithjay
noreply at git.blender.org
Sun Aug 15 15:30:52 CEST 2021
Commit: 86be1307a63363c77cc2f4eb496f818c9371d45f
Author: dilithjay
Date: Sun Aug 15 19:00:32 2021 +0530
Branches: soc-2021-curves
https://developer.blender.org/rB86be1307a63363c77cc2f4eb496f818c9371d45f
Fixed build warning
===================================================================
M release/scripts/addons
M source/blender/editors/curve/curve_intern.h
M source/blender/editors/curve/editcurve.c
===================================================================
diff --git a/release/scripts/addons b/release/scripts/addons
index 31abe549839..84405f65259 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 31abe549839bdb30ce0926142bcbf8a3d9236067
+Subproject commit 84405f65259958b835f3ec0325802e3003098678
diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h
index 819b565f778..dd45681bb8a 100644
--- a/source/blender/editors/curve/curve_intern.h
+++ b/source/blender/editors/curve/curve_intern.h
@@ -147,10 +147,10 @@ int ed_editcurve_addvert(Curve *cu, EditNurb *editnurb, View3D *v3d, const float
bool curve_toggle_cyclic(View3D *v3d, ListBase *editnurb, int direction);
void dissolve_bez_segment(BezTriple *bezt_prev,
BezTriple *bezt_next,
- Nurb *nu,
+ const Nurb *nu,
const Curve *cu,
- const int span_len,
- uint span_step[2]);
+ const uint span_len,
+ const uint span_step[2]);
/* helper functions */
void ed_editnurb_translate_flag(struct ListBase *editnurb,
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 6ee5a7dea06..711a1b3e669 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -6509,7 +6509,7 @@ void dissolve_bez_segment(BezTriple *bezt_prev,
BezTriple *bezt_next,
const Nurb *nu,
const Curve *cu,
- const int span_len,
+ const uint span_len,
const uint span_step[2])
{
int i_span_edge_len = span_len + 1;
More information about the Bf-blender-cvs
mailing list