[Bf-blender-cvs] [7f753eadb46] custom-manipulators: Merge branch 'blender2.8' into custom-manipulators

[Campbell Barton]

Commit: 7f753eadb469ea52043ecf1e592a7c7dc2616004
Author: Campbell Barton
Date:   Wed Apr 12 21:06:16 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB7f753eadb469ea52043ecf1e592a7c7dc2616004

Merge branch 'blender2.8' into custom-manipulators

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



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

diff --cc source/blender/gpu/intern/gpu_buffers.c
index 51c95a7fff6,054803f468a..da119fe488e
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@@ -755,25 -744,7 +755,25 @@@ void GPU_triangle_setup(struct DerivedM
  	GLStates |= GPU_BUFFER_ELEMENT_STATE;
  }
  
 +void GPU_facemap_setup(DerivedMesh *dm)
 +{
 +	if (!gpu_buffer_setup_common(dm, GPU_BUFFER_FACEMAP, false))
 +		return;
 +	
 +	if (!gpu_buffer_setup_common(dm, GPU_BUFFER_VERTEX, false))
 +		return;
 +
 +	glEnableClientState(GL_VERTEX_ARRAY);
 +	glBindBuffer(GL_ARRAY_BUFFER_ARB, dm->drawObject->points->id);
 +	glVertexPointer(3, GL_FLOAT, 0, 0);
 +	
 +	GLStates |= GPU_BUFFER_VERTEX_STATE;
 +	glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, dm->drawObject->facemapindices->id);
 +	
 +	GLStates |= GPU_BUFFER_ELEMENT_STATE;
 +}
 +
- static int GPU_typesize(int type)
+ static int gpu_typesize(int type)
  {
  	switch (type) {
  		case GL_FLOAT: