Blender Git Loki
Git Commits -> Revision d74f6b2
Revision d74f6b2 by Dalai Felinto (pbr-viewport) October 20, 2016, 21:40 (GMT) |
Merge remote-tracking branch 'origin/blender2.8' into pbr-merge Conflicts: source/blender/blenloader/intern/versioning_defaults.c source/blender/editors/space_view3d/drawobject.c source/blender/editors/space_view3d/space_view3d.c source/blender/editors/space_view3d/view3d_draw.c source/blender/gpu/CMakeLists.txt source/blender/gpu/GPU_framebuffer.h source/blender/gpu/GPU_material.h source/blender/gpu/GPU_shader.h source/blender/gpu/intern/gpu_codegen.c source/blender/gpu/intern/gpu_draw.c source/blender/gpu/intern/gpu_framebuffer.c source/blender/gpu/intern/gpu_material.c source/blender/gpu/intern/gpu_shader.c source/blender/makesdna/DNA_view3d_types.h |
Commit Details:
Full Hash: d74f6b22044a925e57e5f40a2ac132df0d6f8e37
Parent Commits: 225edf4, 4948b6e