Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Mar 2018 11:05:55 +0000 (12:05 +0100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Mar 2018 11:05:55 +0000 (12:05 +0100)
commit8eb8aa49397fb038ffa98dbe5dc4aed86e7b3e94
treef5742a0f4414a99bd6738aae9cf4dc21b307fbfc
parentda00a50f7f48bfd95924705e69babea41f9d7b2b
parent7cc2b27099b7435cc1a29a48ae0e4c8335d811f3
Merge branch 'master' into blender2.8
21 files changed:
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenkernel/intern/paint.c
source/blender/blenkernel/intern/particle_distribute.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/armature/armature_utils.c
source/blender/editors/armature/pose_select.c
source/blender/editors/interface/view2d.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/physics/dynamicpaint_ops.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/paint_image_undo.c
source/blender/editors/sculpt_paint/paint_intern.h
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/transform/transform_orientations.c