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
diff options
context:
space:
mode:
-rw-r--r--source/blender/blenkernel/intern/displist.c4
-rw-r--r--source/blender/blenkernel/intern/sequencer.c1
-rw-r--r--source/blender/editors/transform/transform_conversions.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 992e369a20f..eeedd07d401 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -1391,8 +1391,8 @@ static void calc_bevfac_mapping(Curve *cu, BevList *bl, int *r_start, float *r_f
if ((cu->bevfac1_mapping != CU_BEVFAC_MAP_RESOLU) ||
(cu->bevfac2_mapping != CU_BEVFAC_MAP_RESOLU))
{
- bevp_array = MEM_mallocN(sizeof(bevp_array) * (bl->nr - 1), "bevp_dists");
- segments = MEM_callocN(sizeof(segments) * segcount, "bevp_segmentlengths");
+ bevp_array = MEM_mallocN(sizeof(*bevp_array) * (bl->nr - 1), "bevp_dists");
+ segments = MEM_callocN(sizeof(*segments) * segcount, "bevp_segmentlengths");
bevp = (BevPoint *)(bl + 1);
bevp++;
for (i = 1, j = 0; i < bl->nr; bevp++, i++) {
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 13d22cc9950..b9ea2c63c7d 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -515,6 +515,7 @@ SeqRenderData BKE_sequencer_new_render_data(EvaluationContext *eval_ctx,
rval.motion_blur_shutter = 0;
rval.eval_ctx = eval_ctx;
rval.skip_cache = false;
+ rval.is_proxy_render = false;
return rval;
}
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 0b3238c7d1e..c81637cc827 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -6708,7 +6708,7 @@ static void MaskPointToTransData(Scene *scene, MaskSplinePoint *point,
if (i == 0) {
tdm->orig_handle_type = bezt->h1;
}
- else if (i == 3) {
+ else if (i == 2) {
tdm->orig_handle_type = bezt->h2;
}