Blender Git Loki
Git Commits -> Revision f1cd1e6
June 8, 2015, 12:20 (GMT) |
Merge branch 'master' into cycles_memory_experiments Conflicts: intern/cycles/blender/blender_object.cpp intern/cycles/blender/blender_sync.h intern/cycles/render/graph.h intern/cycles/render/mesh.cpp |
Commit Details:
Full Hash: f1cd1e650354dd9096cd35914234441047cc393b
Parent Commits: 303c912, 8b9d181