[Bf-blender-cvs] [5a7b0cf] temp_display_optimization: Merge branch 'master' into temp_display_optimization

[Antony Riakiotakis]

Commit: 5a7b0cf1c7428eed6148be007b58eaa12c2da540
Author: Antony Riakiotakis
Date:   Sun Jul 12 16:26:12 2015 +0200
Branches: temp_display_optimization
https://developer.blender.org/rB5a7b0cf1c7428eed6148be007b58eaa12c2da540

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 d89c297,bcbae99..7c31ffd
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@@ -465,11 -605,13 +465,12 @@@ static GPUBuffer *gpu_try_realloc(GPUBu
  	return buffer;
  }
  
- typedef void (*GPUBufferCopyFunc)(DerivedMesh *dm, float *varray, int *index,
-                                   int *mat_orig_to_new, void *user_data);
+ typedef void (*GPUBufferCopyFunc)(
+         DerivedMesh *dm, float *varray, int *index,
+         const int *mat_orig_to_new, const void *user_data);
  
  static GPUBuffer *gpu_buffer_setup(DerivedMesh *dm, GPUDrawObject *object,
 -                                   int vector_size, int size, GLenum target,
 -                                   void *user, GPUBufferCopyFunc copy_f)
 +                                   int type, void *user)
  {
  	GPUBufferPool *pool;
  	GPUBuffer *buffer;