[Bf-blender-cvs] [693233b1984] blender2.8: Fix T57975: Drawing with Onion Skin enabled crash Blender

Antonioya noreply at git.blender.org
Wed Nov 21 15:53:51 CET 2018


Commit: 693233b1984819a6799ef605e5b3cd3638be25d2
Author: Antonioya
Date:   Wed Nov 21 15:53:17 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB693233b1984819a6799ef605e5b3cd3638be25d2

Fix T57975: Drawing with Onion Skin enabled crash Blender

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

M	source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index ec690fdd14b..6289e76664d 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -109,9 +109,8 @@ void DRW_gpencil_get_point_geom(GpencilBatchCacheElem *be, bGPDstroke *gps, shor
 		GPU_vertbuf_data_alloc(be->vbo, be->tot_vertex);
 		be->vbo_len = 0;
 	}
-	else {
-		gpencil_vbo_ensure_size(be, totvertex);
-	}
+	gpencil_vbo_ensure_size(be, totvertex);
+
 	/* draw stroke curve */
 	const bGPDspoint *pt = gps->points;
 	float alpha;
@@ -156,9 +155,7 @@ void DRW_gpencil_get_stroke_geom(struct GpencilBatchCacheElem *be, bGPDstroke *g
 		GPU_vertbuf_data_alloc(be->vbo, be->tot_vertex);
 		be->vbo_len = 0;
 	}
-	else {
-		gpencil_vbo_ensure_size(be, totvertex);
-	}
+	gpencil_vbo_ensure_size(be, totvertex);
 
 	/* draw stroke curve */
 	const bGPDspoint *pt = points;
@@ -229,9 +226,7 @@ void DRW_gpencil_get_fill_geom(struct GpencilBatchCacheElem *be, Object *ob, bGP
 		GPU_vertbuf_data_alloc(be->vbo, be->tot_vertex);
 		be->vbo_len = 0;
 	}
-	else {
-		gpencil_vbo_ensure_size(be, totvertex);
-	}
+	gpencil_vbo_ensure_size(be, totvertex);
 
 	/* Draw all triangles for filling the polygon (cache must be calculated before) */
 	bGPDtriangle *stroke_triangle = gps->triangles;
@@ -500,9 +495,7 @@ void DRW_gpencil_get_edit_geom(struct GpencilBatchCacheElem *be, bGPDstroke *gps
 		GPU_vertbuf_data_alloc(be->vbo, gps->totpoints);
 		be->vbo_len = 0;
 	}
-	else {
-		gpencil_vbo_ensure_size(be, gps->totpoints);
-	}
+	gpencil_vbo_ensure_size(be, gps->totpoints);
 
 	/* Draw start and end point differently if enabled stroke direction hint */
 	bool show_direction_hint = (dflag & GP_DATA_SHOW_DIRECTION) && (gps->totpoints > 1);
@@ -581,9 +574,7 @@ void DRW_gpencil_get_edlin_geom(struct GpencilBatchCacheElem *be, bGPDstroke *gp
 		GPU_vertbuf_data_alloc(be->vbo, gps->totpoints);
 		be->vbo_len = 0;
 	}
-	else {
-		gpencil_vbo_ensure_size(be, gps->totpoints);
-	}
+	gpencil_vbo_ensure_size(be, gps->totpoints);
 
 	/* Draw all the stroke lines (selected or not) */
 	bGPDspoint *pt = gps->points;



More information about the Bf-blender-cvs mailing list