[Bf-blender-cvs] [ffe02e17b2f] blender2.8: GWN Immediate: use GWN_BATCH_OWNS_VBO for created with imm immBeginBatch.

Germano noreply at git.blender.org
Thu Apr 19 16:24:21 CEST 2018


Commit: ffe02e17b2fa39865ee4cfa53d4f6c06bdfe31d9
Author: Germano
Date:   Thu Apr 19 11:24:10 2018 -0300
Branches: blender2.8
https://developer.blender.org/rBffe02e17b2fa39865ee4cfa53d4f6c06bdfe31d9

GWN Immediate: use GWN_BATCH_OWNS_VBO for created with imm immBeginBatch.

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

M	intern/gawain/src/gwn_immediate.c
M	source/blender/editors/uvedit/uvedit_draw.c

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

diff --git a/intern/gawain/src/gwn_immediate.c b/intern/gawain/src/gwn_immediate.c
index 0e57aefebe2..006af0abe01 100644
--- a/intern/gawain/src/gwn_immediate.c
+++ b/intern/gawain/src/gwn_immediate.c
@@ -275,7 +275,7 @@ Gwn_Batch* immBeginBatch(Gwn_PrimType prim_type, unsigned vertex_ct)
 	imm.buffer_bytes_mapped = GWN_vertbuf_size_get(verts);
 	imm.vertex_data = verts->data;
 
-	imm.batch = GWN_batch_create(prim_type, verts, NULL);
+	imm.batch = GWN_batch_create_ex(prim_type, verts, NULL, GWN_BATCH_OWNS_VBO);
 	imm.batch->phase = GWN_BATCH_BUILDING;
 
 	return imm.batch;
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index a47884b431c..bcdc8193137 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -414,8 +414,6 @@ static void draw_uvs_lineloop_bmfaces(BMesh *bm, const int cd_loop_uv_offset, co
 		index += efa->len;
 	}
 	GWN_batch_program_use_end(loop_batch);
-
-	GWN_vertbuf_discard(loop_batch->verts[0]);
 	GWN_batch_discard(loop_batch);
 
 	immUnbindProgram();
@@ -908,7 +906,6 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, ViewLayer *view_layer, Obje
 					immEnd();
 
 					GWN_batch_draw(flat_edges_batch);
-					GWN_vertbuf_discard(flat_edges_batch->verts[0]);
 					GWN_batch_discard(flat_edges_batch);
 
 					immUnbindProgram();
@@ -937,7 +934,6 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, ViewLayer *view_layer, Obje
 		immUnbindProgram();
 	}
 
-	GWN_vertbuf_discard(loop_vbo);
 	GWN_batch_discard(loop_batch);
 
 	if (sima->flag & SI_SMOOTH_UV) {



More information about the Bf-blender-cvs mailing list