Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-08-01 03:38:36 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-08-01 03:38:36 +0300
commit8ddaa6a4e237cfa667ace4a00f147e2683d83840 (patch)
tree96c6e1b8ca4051317b42a3b77269c61c45af8f66 /extern
parentb71366801e45dafd7fb8c658edeaf88dfb4cb84e (diff)
parenta372638a76e05aaa44589845680c15a7f09a7f1e (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'extern')
-rw-r--r--extern/curve_fit_nd/intern/curve_fit_cubic_refit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c b/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c
index 96ec9a33270..b5340efdcb2 100644
--- a/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c
+++ b/extern/curve_fit_nd/intern/curve_fit_cubic_refit.c
@@ -137,7 +137,7 @@ struct Knot {
/* Initially point to contiguous memory, however we may re-assign */
double *tan[2];
-} Knot;
+};
struct KnotRemoveState {
@@ -1102,7 +1102,7 @@ int curve_fit_cubic_to_points_refit_db(
uint **r_corner_index_array, uint *r_corner_index_len)
{
const uint knots_len = points_len;
- struct Knot *knots = malloc(sizeof(Knot) * knots_len);
+ struct Knot *knots = malloc(sizeof(struct Knot) * knots_len);
#ifndef USE_CORNER_DETECT
(void)r_corner_index_array;