Merge branch 'master' into blender2.8
authorLuca Rood <dev@lucarood.com>
Mon, 27 Feb 2017 19:08:25 +0000 (16:08 -0300)
committerLuca Rood <dev@lucarood.com>
Mon, 27 Feb 2017 19:08:25 +0000 (16:08 -0300)
commit6ab9af0083a947b88ef71b247ce1853145351890
treea71df9e88cfd2b75ffa0db795cc8bf0dc5377767
parentbf243752fc3ff2eebc842c250aaa7f7be5aadb73
parent4fa4132e45c97df24108b14fa3c11b2b4b04d22c
Merge branch 'master' into blender2.8
13 files changed:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_ops.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/transform/transform_snap_object.c
source/blender/makesrna/RNA_access.h
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/intern/MOD_surfacedeform.c