Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 12 Jun 2017 13:09:33 +0000 (15:09 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 12 Jun 2017 13:12:36 +0000 (15:12 +0200)
commit0f4f4d87542b96942234e10421823dcc6766331c
treefd545e6a4ed9ad0652e7e7e18fb76a9e1324e748
parentf52dc2f371923c22a974df7105245f7e0b8148ee
parentd8957e4ccec4cda1cd72e94045efba6ab2ceb6fd
Merge branch 'master' into blender2.8
35 files changed:
intern/cycles/blender/addon/engine.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/device/device.cpp
intern/cycles/device/device.h
release/scripts/startup/bl_ui/properties_material.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/pbvh.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/readfile.c
source/blender/depsgraph/DEG_depsgraph_build.h
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/depsgraph/intern/depsgraph_build.cc
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/object/object_relations.c
source/blender/editors/physics/dynamicpaint_ops.c
source/blender/editors/physics/physics_pointcache.c
source/blender/editors/transform/transform_generics.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/modifiers/intern/MOD_array.c
source/blender/modifiers/intern/MOD_curve.c
source/blender/windowmanager/intern/wm_files.c
tests/python/bl_alembic_import_test.py