Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 19 Sep 2017 16:08:14 +0000 (21:08 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 19 Sep 2017 16:08:14 +0000 (21:08 +0500)
20 files changed:
1  2 
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenlib/BLI_utildefines.h
source/blender/blenlib/CMakeLists.txt
source/blender/bmesh/tools/bmesh_intersect.c
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_boolean.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
source/blender/modifiers/intern/MOD_solidify.c

Simple merge