Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 19 Jun 2017 05:06:48 +0000 (15:06 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 19 Jun 2017 05:06:48 +0000 (15:06 +1000)
commit9649c6bef548a799ea620a4ac1abce7935849f2e
tree4d32a14aa4302cf4c965023cd955db24bb3359c2
parentcf7447dacbc3c5c0d5fb80e3b082d745e4955e12
parent72c9141a7a56fa4762ac0daae501f1609532506c
Merge branch 'master' into blender2.8
13 files changed:
doc/python_api/sphinx_doc_gen.py
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_util.h
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenlib/intern/math_matrix.c
source/blender/editors/armature/armature_naming.c
source/blender/editors/gpencil/gpencil_utils.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/space_node.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap_object.c
source/blender/python/intern/bpy_rna.c