Merge branch 'master' into blender2.8
authorGermano <germano.costa@ig.com.br>
Thu, 3 May 2018 17:33:52 +0000 (14:33 -0300)
committerGermano <germano.costa@ig.com.br>
Thu, 3 May 2018 17:33:52 +0000 (14:33 -0300)
commita9d264f5ca1d631e1151bff55fd8cb3c87193bce
tree9c70cb490d8056f7f54a117eac4bdcba7a2c3237
parent20185a8681f15f3e4e129e064fbe9a150dc4c963
parentac19483e632bd3e2388a6a0de2db753efe33a860
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/constraint.c
source/blender/editors/physics/particle_object.c
source/blender/editors/transform/transform_snap_object.c
source/blender/modifiers/intern/MOD_surface.c
source/blender/modifiers/intern/MOD_surfacedeform.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/render/intern/source/bake_api.c