diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-06 20:38:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-06 20:38:21 +0400 |
| commit | 85540d5aa7abb487e546b5483fffeef2e6075af5 (patch) | |
| tree | 61e47f78a9cbf29683434fa20c8a5f5d73da979e /source/blender/gpu | |
| parent | 7c88bc5952c7e9f8a7f48d00d94b335bd0169c2e (diff) | |
more macro --> BLI math lib, mainly replace VECCOPY in render and blenkernel.
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 26c08f6cae5..a438d5c86e9 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -296,7 +296,7 @@ void GPU_material_bind_uniforms(GPUMaterial *material, float obmat[][4], float v GPU_shader_uniform_vector(shader, material->invobmatloc, 16, 1, (float*)invmat); } if(material->builtins & GPU_OBCOLOR) { - QUATCOPY(col, obcol); + copy_v4_v4(col, obcol); CLAMP(col[3], 0.0f, 1.0f); GPU_shader_uniform_vector(shader, material->obcolloc, 4, 1, col); } |