Commit: 7b8d68006453812d42dfe1f4ed4c70750a21c319 Author: Antony Riakiotakis Date: Fri Oct 16 13:42:37 2015 +0300 Branches: temp_display_optimization https://developer.blender.org/rB7b8d68006453812d42dfe1f4ed4c70750a21c319
Merge branch 'master' into temp_display_optimization Conflicts: source/blender/gpu/intern/gpu_buffers.c =================================================================== =================================================================== diff --cc source/blender/gpu/intern/gpu_buffers.c index 5c86643,b4617b9..d19b28e --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@@ -94,10 -95,6 +95,8 @@@ const GPUBufferTypeSettings gpu_buffer_ {GL_ELEMENT_ARRAY_BUFFER_ARB, 4}, /* triangles, 1 point since we are allocating from tottriangle points, which account for all points */ {GL_ELEMENT_ARRAY_BUFFER_ARB, 1}, - /* fast triangles */ - {GL_ELEMENT_ARRAY_BUFFER_ARB, 1}, + /* editface colors */ + {GL_ARRAY_BUFFER_ARB, 4}, }; #define MAX_GPU_ATTRIB_DATA 32 _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs