Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 9 Jan 2018 15:15:33 +0000 (16:15 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 9 Jan 2018 15:15:33 +0000 (16:15 +0100)
commit6deb908a5c9f34deb4c19561082b14d8eda51e43
treee72c9fd7b77f486deea839428573c0788c9ceda9
parent1cab3be7a7af483ed645c2912b3aed3292812746
parent932d448ae013b5425efa974be5a106d9d6a16652
Merge branch 'master' into blender2.8
20 files changed:
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pbvh.c
source/blender/blenkernel/intern/smoke.c
source/blender/depsgraph/intern/eval/deg_eval.cc
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
source/blender/editors/sculpt_paint/paint_cursor.c
source/blender/editors/sculpt_paint/paint_image_2d.c
source/blender/editors/sculpt_paint/paint_mask.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sculpt_paint/sculpt_undo.c
source/blender/modifiers/intern/MOD_displace.c
source/blender/modifiers/intern/MOD_meshdeform.c
source/blender/modifiers/intern/MOD_ocean.c
source/blender/modifiers/intern/MOD_surfacedeform.c
source/blender/modifiers/intern/MOD_uvwarp.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/render/intern/source/pointdensity.c