diff options
| author | mano-wii <germano.costa@ig.com.br> | 2017-07-11 19:54:08 +0300 |
|---|---|---|
| committer | mano-wii <germano.costa@ig.com.br> | 2017-07-11 19:54:08 +0300 |
| commit | 538475dec7585bb77f57215e722f5b6762907d51 (patch) | |
| tree | 7708fa2b90ef82d302e74ff894a10f0a95bbe237 /source/blender/draw/engines/eevee/shaders/bsdf_direct_lib.glsl | |
| parent | 11ee5aa4f9b60ddb7597b65926c125d5536863ca (diff) | |
| parent | dd1edb0954b5441255b5a3616841228f466e448e (diff) | |
Merge branch 'master' of git@git.blender.org:blender.git into blender2.8
# Conflicts:
# source/blender/editors/transform/transform_snap_object.c
Diffstat (limited to 'source/blender/draw/engines/eevee/shaders/bsdf_direct_lib.glsl')
0 files changed, 0 insertions, 0 deletions