Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 14 Jun 2017 20:39:33 +0000 (22:39 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 14 Jun 2017 20:39:33 +0000 (22:39 +0200)
commit7439919ac0c4b0146cfed0ddbb8b945fe3675bcb
tree39730e1c17f939bd12e465ce597e2f24bbd91d34
parentdbca1afefa700f25198761624cdb9f1fd21095d2
parenteeb9e5316a615f0e5052b28eee4966c4e2ed1152
Merge branch 'master' into blender2.8
35 files changed:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_armature.h
source/blender/blenkernel/BKE_cachefile.h
source/blender/blenkernel/BKE_camera.h
source/blender/blenkernel/BKE_curve.h
source/blender/blenkernel/BKE_group.h
source/blender/blenkernel/BKE_lattice.h
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_material.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/cachefile.c
source/blender/blenkernel/intern/camera.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/icons.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/lamp.c
source/blender/blenkernel/intern/lattice.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/paint.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/text.c