Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 16 Sep 2016 15:09:28 +0000 (17:09 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 16 Sep 2016 15:09:28 +0000 (17:09 +0200)
commitd96b8e168f3c809cd79f6028dbf99eeeebb71302
tree75ee78ee75ea602c2c698f4b4ec8494093b949c7
parent76c99f361f58752eff8054f5cff52cad9ce57145
parent4b39069908c88099860c04a3b7d3b4aae0a272f5
Merge branch 'master' into blender2.8
21 files changed:
intern/cycles/blender/blender_object.cpp
release/scripts/startup/bl_ui/space_view3d.py
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_hair.cc
source/blender/alembic/intern/abc_mesh.cc
source/blender/alembic/intern/abc_points.cc
source/blender/blenkernel/intern/library_remap.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/windowmanager/intern/wm_event_system.c