Merge branch 'master' into blender2.8
authorAlexander Romanov <a.romanov@blend4web.com>
Thu, 13 Apr 2017 10:02:39 +0000 (13:02 +0300)
committerAlexander Romanov <a.romanov@blend4web.com>
Thu, 13 Apr 2017 10:02:39 +0000 (13:02 +0300)
commit6f268ac55d834ca9ba098b321dc101fbba93d773
tree6a18624d0c7940af708c69103322fdcaaf5126fc
parent0a62e971b2413dee218f43e8ba01b14c3a005b7f
parentf5bc8ad4ce87165fc0648f1cd8c0ae1fb5f07281
Merge branch 'master' into blender2.8
20 files changed:
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_mesh.cc
source/blender/alembic/intern/abc_util.cc
source/blender/alembic/intern/abc_util.h
source/blender/blenkernel/intern/idprop.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/node.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/object/object_relations.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_internal.h
tests/python/CMakeLists.txt