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)
1  2 
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

Simple merge
Simple merge