Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 21 Jul 2017 09:16:37 +0000 (11:16 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 21 Jul 2017 09:18:02 +0000 (11:18 +0200)
commit9fbef5d5d5cd172aa8225134213fb0c3eeea1009
tree401bec7b8d0d069a8769e77c1951cdd81ecc943c
parentc425653f1647d094583b29f004eee5cd4f6e9446
parent4d67034076f58905f03d947af7cfe3455b4f33ab
Merge branch 'master' into blender2.8
16 files changed:
intern/cycles/blender/blender_mesh.cpp
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_session.h
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/particle_system.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/depsgraph_type_defines.cc
source/blender/depsgraph/intern/depsgraph_types.h
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_utils.c
source/blender/editors/object/object_add.c
source/blender/editors/sculpt_paint/paint_image_2d.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/space_image/image_ops.c