Merge branch 'master' into blender28
authorCampbell Barton <ideasman42@gmail.com>
Fri, 15 Jun 2018 13:42:42 +0000 (15:42 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 15 Jun 2018 13:42:42 +0000 (15:42 +0200)
commit0b8c2eed7561e951ecd99421a8d05fffbf28a48b
treefd1d3a514dc555bf4fdf0c1d879878ef12266952
parent8166d0affdac7da7a17aa2e178baa34a8afd82f1
parentb84fad2ba3920f3e337dc9084a30f1ea38f39fc2
Merge branch 'master' into blender28
release/scripts/addons
release/scripts/addons_contrib
source/blender/bmesh/tools/bmesh_intersect.c
source/blender/editors/mesh/editmesh_intersect.c
source/blender/modifiers/intern/MOD_boolean.c