diff options
author | Germano <germano.costa@ig.com.br> | 2018-01-21 23:45:47 +0300 |
---|---|---|
committer | Germano <germano.costa@ig.com.br> | 2018-01-21 23:45:47 +0300 |
commit | 790025c01ed76c06e69e6054f1a718ca57771e28 (patch) | |
tree | 7461d495f199142172b0efa34e5ad75ea65def6a /source/blender/draw/engines/eevee/eevee_occlusion.c | |
parent | 99efebd2dd24a8e0827cf0f13bc40c2844946676 (diff) | |
parent | 8d671f6f6550605ac738f7a9727375a024614837 (diff) |
Merge branch 'master' into blender2.8
# Conflicts:
# intern/cycles/blender/blender_mesh.cpp
# source/blender/editors/screen/screen_ops.c
# source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_occlusion.c')
0 files changed, 0 insertions, 0 deletions