Blender Git Loki
Git Commits -> Revision 7bb03d9
Revision 7bb03d9 by Kévin Dietrich (openvdb) January 23, 2016, 08:12 (GMT) |
Merge branch 'master' into openvdb Conflicts: CMakeLists.txt build_files/cmake/Modules/FindOpenVDB.cmake intern/openvdb/CMakeLists.txt intern/openvdb/intern/openvdb_dense_convert.cc intern/openvdb/intern/openvdb_dense_convert.h intern/openvdb/intern/openvdb_reader.cc intern/openvdb/intern/openvdb_reader.h intern/openvdb/intern/openvdb_writer.cc intern/openvdb/intern/openvdb_writer.h intern/openvdb/openvdb_capi.cc intern/openvdb/openvdb_capi.h intern/openvdb/openvdb_util.cc intern/openvdb/openvdb_util.h source/blender/blenkernel/CMakeLists.txt source/blender/python/intern/CMakeLists.txt source/blender/python/intern/bpy_app_openvdb.c |
Commit Details:
Full Hash: 7bb03d99f60193177853d36073c24da306c72491
Parent Commits: 2ebed32, e9452f9