[Bf-blender-cvs] [36efa02db3f] greasepencil-object: Revert "GWN: Fix immediate mode when closing a window."

[Antonio Vazquez]

Commit: 36efa02db3ff743333e9020dc61a3b868667f3da
Author: Antonio Vazquez
Date:   Sun Feb 25 16:54:11 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB36efa02db3ff743333e9020dc61a3b868667f3da

Revert "GWN: Fix immediate mode when closing a window."

This reverts commit https://developer.blender.org/rBe7c4a9d1ef76f6edff95ca9f418a65fc42a453dc

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

M	intern/gawain/src/gwn_immediate.c

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

diff --git a/intern/gawain/src/gwn_immediate.c b/intern/gawain/src/gwn_immediate.c
index 0fe8e7a3f7c..f063665b423 100644
--- a/intern/gawain/src/gwn_immediate.c
+++ b/intern/gawain/src/gwn_immediate.c
@@ -28,6 +28,8 @@ typedef struct {
 #if IMM_BATCH_COMBO
 	Gwn_Batch* batch;
 #endif
+	Gwn_Context* context;
+
 	// current draw call
 	GLubyte* buffer_data;
 	unsigned buffer_offset;
@@ -86,7 +88,8 @@ void immActivate(void)
 	assert(imm.prim_type == GWN_PRIM_NONE); // make sure we're not between a Begin/End pair
 	assert(imm.vao_id == 0);
 #endif
-	imm.vao_id = GWN_vao_default();
+	imm.vao_id = GWN_vao_alloc();
+	imm.context = GWN_context_active_get();
 	}
 
 void immDeactivate(void)
@@ -96,6 +99,7 @@ void immDeactivate(void)
 	assert(imm.prim_type == GWN_PRIM_NONE); // make sure we're not between a Begin/End pair
 	assert(imm.vao_id != 0);
 #endif
+	GWN_vao_free(imm.vao_id, imm.context);
 	imm.vao_id = 0;
 	imm.prev_enabled_attrib_bits = 0;
 	}