Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 31 Aug 2017 11:57:14 +0000 (21:57 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 31 Aug 2017 11:57:38 +0000 (21:57 +1000)
commit323a7ab944132335f27ba21519df161d7a3351c9
treeebccd8e52bcead21faaadbcf4c427293e598061c
parent480def9c5587b710ce478a58985e2e4359c14467
parenta35aae9e4972656c0e619c03aa0b26c903d16b34
Merge branch 'master' into blender2.8
13 files changed:
source/blender/alembic/intern/abc_util.cc
source/blender/alembic/intern/alembic_capi.cc
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/mesh.c
source/blender/editors/interface/interface_ops.c
source/blender/editors/object/object_add.c
source/blender/editors/screen/screen_context.c
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_wm.c
source/blender/makesrna/intern/rna_wm_manipulator.c
tests/python/CMakeLists.txt