Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 6 Mar 2018 08:13:41 +0000 (19:13 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 6 Mar 2018 08:13:41 +0000 (19:13 +1100)
commita5a0dcec902d6bbff0fe0fc1bb7fb21045823166
tree3d155f73d865b418a1e59889587223b2a9e2b6aa
parentdd611dd0b87a36ffafb04177ec923e3b6d76bf71
parentb5b5260464fbba81610f26d4e04e5aedeef8cfd6
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/object_deform.c
source/blender/editors/mesh/meshtools.c
source/blender/modifiers/intern/MOD_array.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt