Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 30 Jan 2018 13:32:27 +0000 (14:32 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 30 Jan 2018 13:32:27 +0000 (14:32 +0100)
commit0d64857c3f2364349475728958fac211b0bad5a2
treefe73096f14f2fef92aba25b4ad77e63e1c079465
parentb5cbc8bb606654a21e25cb616d60c89ac61c65a9
parentb3c4a2a8da7f1a243628da852d1b8fdc986cbc25
Merge branch 'master' into blender2.8
16 files changed:
intern/cycles/blender/blender_mesh.cpp
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/paint.c
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
source/blender/editors/include/ED_view3d.h
source/blender/editors/object/object_edit.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/makesrna/intern/rna_space.c
source/creator/creator_args.c