diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-30 19:04:46 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-30 19:04:46 +0400 |
| commit | 168ffbfb67302c7ee2d2d17941c0b3f8324d00e5 (patch) | |
| tree | 7a6c8abefec9661fc77bcefe4b4bba6c8a832946 /source/blender/gpu/GPU_buffers.h | |
| parent | 4b6be3c19b22af74b2f5aa2f60f38662e6c4c113 (diff) | |
Revert changes made to support diffuse color when sculpting
This changes are not stable enough and trying fix it could backfire in some
other regressions which isn't wanted so much close to the release.
This means objects will have gray color as diffuse which becomes darker in
masked areas for 2.64.
Proper fix is aimed for 2.65.
This commit reverts 50827 and 50898.
Diffstat (limited to 'source/blender/gpu/GPU_buffers.h')
| -rw-r--r-- | source/blender/gpu/GPU_buffers.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h index 745ca1ef2ac..1729ac06f5a 100644 --- a/source/blender/gpu/GPU_buffers.h +++ b/source/blender/gpu/GPU_buffers.h @@ -162,9 +162,8 @@ GPU_Buffers *GPU_build_mesh_buffers(int (*face_vert_indices)[4], struct MFace *mface, struct MVert *mvert, int *face_indices, int totface); -void GPU_update_mesh_buffers(GPU_Buffers *buffers, struct MFace *mface, int *face_indices, int totface, - struct MVert *mvert, int *vert_indices, int totvert, - int (*face_vert_indices)[4], const float *vmask); +void GPU_update_mesh_buffers(GPU_Buffers *buffers, struct MVert *mvert, + int *vert_indices, int totvert, const float *vmask); GPU_Buffers *GPU_build_grid_buffers(int *grid_indices, int totgrid, unsigned int **grid_hidden, int gridsize); |