diff options
| author | Clément Fukhaut <turjuque@gmail.com> | 2016-05-30 21:09:02 +0300 |
|---|---|---|
| committer | Clément Fukhaut <turjuque@gmail.com> | 2016-05-30 21:09:02 +0300 |
| commit | 6ebbef4724dd7d6f09677d5cd871042a44f8008c (patch) | |
| tree | f238502b654d063ed9b88d3f70e0c3b878a15c93 /source/blender/gpu/GPU_ltc.h | |
| parent | bcf5e1c7f574c55b92c739d36eb97554366956d0 (diff) | |
| parent | 7e120f3a740897edb4362fb5e1ba69e869b5b7d9 (diff) | |
Merge branch 'master' of git://git.blender.org/blender
# Conflicts:
# source/blender/gpu/intern/gpu_draw.c
# source/blender/gpu/shaders/gpu_shader_material.glsl
# source/blender/makesdna/DNA_view3d_types.h
# source/blender/nodes/shader/nodes/node_shader_normal_map.c
# source/blender/nodes/shader/nodes/node_shader_tex_environment.c
# source/blender/nodes/shader/nodes/node_shader_tex_image.c
# source/blender/nodes/shader/nodes/node_shader_tex_noise.c
# source/blender/nodes/shader/nodes/node_shader_texture.c
Diffstat (limited to 'source/blender/gpu/GPU_ltc.h')
0 files changed, 0 insertions, 0 deletions