Commit: 949d92ad5d1fd99f56a2bd9f50d4094193b84c98
Author: Clément Foucault
Date: Tue Aug 25 17:40:21 2020 +0200
Branches: master
https://developer.blender.org/rB949d92ad5d1fd99f56a2bd9f50d4094193b84c98
Fix T79811 MacOS: Edit Mode - vertex/edge/face selection is missing
The VAO reconfiguration from the offset workaround was not working.
===================================================================
M source/blender/gpu/opengl/gl_batch.cc
===================================================================
diff --git a/source/blender/gpu/opengl/gl_batch.cc
b/source/blender/gpu/opengl/gl_batch.cc
index 953536de460..7d6270bca93 100644
--- a/source/blender/gpu/opengl/gl_batch.cc
+++ b/source/blender/gpu/opengl/gl_batch.cc
@@ -69,6 +69,7 @@ void GLVaoCache::init(void)
}
vao_base_instance_ = 0;
base_instance_ = 0;
+ vao_id_ = 0;
}
/* Create a new VAO object and store it in the cache. */
@@ -239,6 +240,7 @@ GLuint GLVaoCache::base_instance_vao_get(GPUBatch *batch,
int i_first)
#ifdef __APPLE__
glDeleteVertexArrays(1, &vao_base_instance_);
vao_base_instance_ = 0;
+ base_instance_ = 0;
#endif
if (vao_base_instance_ == 0) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
