Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 22 Jun 2018 10:46:16 +0000 (12:46 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 22 Jun 2018 10:46:16 +0000 (12:46 +0200)
commit646412004b1da5d6b7b831a5a49022d1fd138e0b
treec3e2ba99cd4eb8ea312a59efd4ed7a8e9c1c7f28
parentb6b7c83dd8e4838d4819c25d95dd01cacf81c8d8
parent2fe528424d168f124efca5d94c6b0363be49dbf3
Merge branch 'master' into blender2.8

Conflicts:
source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/makesrna/intern/rna_screen.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_space.c
source/blender/python/bmesh/bmesh_py_types.c
source/blender/python/generic/bpy_internal_import.h
source/blender/python/intern/bpy_rna_anim.c
source/blender/python/intern/gpu_offscreen.c
16 files changed:
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/library.c
source/blender/editors/mesh/editmesh_bevel.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_pose.c
source/blender/makesrna/intern/rna_screen.c
source/blender/makesrna/intern/rna_space.c
source/blender/python/bmesh/bmesh_py_types.c
source/blender/python/generic/bpy_internal_import.c
source/blender/python/intern/bpy.c
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/bpy_rna_anim.c
source/blender/python/intern/gpu_offscreen.c