Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 11 Aug 2017 14:23:49 +0000 (00:23 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 11 Aug 2017 14:23:49 +0000 (00:23 +1000)
commit9567529b8f854449e10d59f793f0a225b9a4c495
tree198842c6572ae2b59fca41621e3dbd561a5817ea
parentd9323a537ffc070081bd2353f8e918b528e8c581
parente6da7bb75c8eff13185a56a144dce920b3886ecb
Merge branch 'master' into blender2.8
25 files changed:
source/blender/blenkernel/BKE_curve.h
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/node.c
source/blender/blenlib/BLI_ghash.h
source/blender/editors/animation/keyframing.c
source/blender/editors/include/ED_armature.h
source/blender/editors/interface/interface_layout.c
source/blender/editors/object/object_transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_define.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_curve_api.c
source/blender/makesrna/intern/rna_internal_types.h
source/blender/makesrna/intern/rna_meta_api.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_wm.c
source/blender/python/intern/bpy_manipulator_wrap.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/manipulators/intern/wm_manipulator_type.c
source/blenderplayer/bad_level_call_stubs/stubs.c