Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 12 Aug 2017 04:06:02 +0000 (14:06 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 12 Aug 2017 04:06:29 +0000 (14:06 +1000)
commita60727080f136bbbc3628bcd54d4d78fc95b6a4e
tree8386f890e47488b22445dac8a9d4772b70d285d9
parent9567529b8f854449e10d59f793f0a225b9a4c495
parentccb8e78d6cf44de53e7a49386d2b95636c593894
Merge branch 'master' into blender2.8
21 files changed:
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/fluidsim.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform_snap_object.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
source/blender/python/mathutils/mathutils_bvhtree.c