Merge branch 'master' into blender2.8
authorGermano <germano.costa@ig.com.br>
Fri, 4 May 2018 10:44:34 +0000 (07:44 -0300)
committerGermano <germano.costa@ig.com.br>
Fri, 4 May 2018 10:44:34 +0000 (07:44 -0300)
commita0f369bc13022fe3773420edc87424eefb8a0300
tree742f17843a5c9ddc9c2d9b80d6820a155e30a2b4
parentc2fe75bf262f373bd05a00683276205d7e66675d
parentb886cdf81d94edb62cac73578fa8ab9ede623452
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/constraint.c
source/blender/editors/armature/meshlaplacian.c