Commit: e6711119f217782315f83e8403d4aeca25db2104
Author: Antony Riakiotakis
Date: Fri Jul 17 19:13:22 2015 +0200
Branches: master
https://developer.blender.org/rBe6711119f217782315f83e8403d4aeca25db2104
Absent-mindedness...Remove testing code
===================================================================
M source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c
b/source/blender/blenkernel/intern/cdderivedmesh.c
index 9c3102a..8d91fe8 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -872,8 +872,7 @@ static void cdDM_drawMappedFacesGLSL(
glShadeModel(GL_SMOOTH);
/* workaround for NVIDIA GPUs on Mac not supporting vertex arrays +
interleaved formats, see T43342 */
- //GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_MAC, GPU_DRIVER_ANY) &&
- if (((U.gameflags & USER_DISABLE_VBO)) ||
+ if ((GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_MAC, GPU_DRIVER_ANY) &&
(U.gameflags & USER_DISABLE_VBO)) ||
setDrawOptions != NULL)
{
DMVertexAttribs attribs;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
