[Bf-blender-cvs] [a5be03b] master: Fix deffects reported by CoverityScan (nothing dramatic, but at least one was a (minor) bug).

Bastien Montagne noreply at git.blender.org
Mon Mar 31 17:12:20 CEST 2014


Commit: a5be03b270c77fe0770102e541adf572e6d6f89a
Author: Bastien Montagne
Date:   Mon Mar 31 16:42:15 2014 +0200
https://developer.blender.org/rBa5be03b270c77fe0770102e541adf572e6d6f89a

Fix deffects reported by CoverityScan (nothing dramatic, but at least one was a (minor) bug).

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

M	source/blender/blenkernel/intern/displist.c
M	source/blender/blenkernel/intern/sequencer.c
M	source/blender/editors/transform/transform_conversions.c

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

diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 992e369..eeedd07 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 13d22cc..b9ea2c6 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 0b3238c..c81637c 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;
 			}




More information about the Bf-blender-cvs mailing list