[Bf-blender-cvs] [6028ff2736e] blender2.8: Correct error drawing curve normals

Campbell Barton noreply at git.blender.org
Thu Apr 20 12:58:27 CEST 2017


Commit: 6028ff2736eeddbdb79ee1c614703faaf01d8b51
Author: Campbell Barton
Date:   Thu Apr 20 20:59:42 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB6028ff2736eeddbdb79ee1c614703faaf01d8b51

Correct error drawing curve normals

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

M	source/blender/blenkernel/intern/curve_render.c

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

diff --git a/source/blender/blenkernel/intern/curve_render.c b/source/blender/blenkernel/intern/curve_render.c
index dbeb5351dc9..0dcee01f9d7 100644
--- a/source/blender/blenkernel/intern/curve_render.c
+++ b/source/blender/blenkernel/intern/curve_render.c
@@ -590,10 +590,11 @@ static ElementList *curve_batch_cache_get_normal_edges(CurveRenderData *rdata, C
 
 	if (cache->normal.edges == NULL) {
 		const int normal_len = curve_render_data_normal_len_get(rdata);
+		const int vert_len = normal_len * 3;
 		const int edge_len = normal_len * 2;
 
 		ElementListBuilder elb;
-		ElementListBuilder_init(&elb, PRIM_LINES, edge_len, normal_len * 2);
+		ElementListBuilder_init(&elb, PRIM_LINES, edge_len, vert_len);
 
 		int vbo_len_used = 0;
 		for (int i = 0; i < normal_len; i++) {
@@ -602,7 +603,7 @@ static ElementList *curve_batch_cache_get_normal_edges(CurveRenderData *rdata, C
 			vbo_len_used += 3;
 		}
 
-		BLI_assert(vbo_len_used == normal_len * 3);
+		BLI_assert(vbo_len_used == vert_len);
 
 		cache->normal.elem = ElementList_build(&elb);
 	}




More information about the Bf-blender-cvs mailing list