Commit: e7c4a9d1ef76f6edff95ca9f418a65fc42a453dc
Author: Clément Foucault
Date: Thu Feb 22 16:36:16 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBe7c4a9d1ef76f6edff95ca9f418a65fc42a453dc
GWN: Fix immediate mode when closing a window.
===================================================================
M intern/gawain/src/gwn_immediate.c
===================================================================
diff --git a/intern/gawain/src/gwn_immediate.c
b/intern/gawain/src/gwn_immediate.c
index f063665b423..0fe8e7a3f7c 100644
--- a/intern/gawain/src/gwn_immediate.c
+++ b/intern/gawain/src/gwn_immediate.c
@@ -28,8 +28,6 @@ typedef struct {
#if IMM_BATCH_COMBO
Gwn_Batch* batch;
#endif
- Gwn_Context* context;
-
// current draw call
GLubyte* buffer_data;
unsigned buffer_offset;
@@ -88,8 +86,7 @@ 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_alloc();
- imm.context = GWN_context_active_get();
+ imm.vao_id = GWN_vao_default();
}
void immDeactivate(void)
@@ -99,7 +96,6 @@ 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;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
