Merged changes in the trunk up to revision 45308.

Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c

1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index 61d563a54e0..53555346caf 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -895,11 +895,11 @@ static int gpu_buffer_size_from_type(DerivedMesh *dm, GPUBufferType type)
 		return sizeof(int)*2*dm->drawObject->totedge;
 	case GPU_BUFFER_UVEDGE:
 		/* each face gets 3 points, 3 edges per triangle, and
-		   each edge has its own, non-shared coords, so each
-		   tri corner needs minimum of 4 floats, quads used
-		   less so here we can over allocate and assume all
-		   tris. */
-		return sizeof(float) * dm->drawObject->tot_triangle_point;
+		 * each edge has its own, non-shared coords, so each
+		 * tri corner needs minimum of 4 floats, quads used
+		 * less so here we can over allocate and assume all
+		 * tris. */
+		return sizeof(float) * 4 * dm->drawObject->tot_triangle_point;
 	default:
 		return -1;
 	}