Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 28 Aug 2017 09:27:50 +0000 (11:27 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 28 Aug 2017 09:27:50 +0000 (11:27 +0200)
commitf9f4e208713ec2b4fa8f8e112fb50cfd1ee6a266
treed20c41753ed01f847e3baab635d20fdfd058e0a3
parent49e7b77b1952c6ea4ab5064d0d31b54052301ffd
parent2e71927622ec7e25c400f23b58fd8d14e056482d
Merge branch 'master' into blender2.8
19 files changed:
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/icons.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object_deform.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_tree.c
source/blender/editors/space_time/space_time.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_key.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_texture.c
source/blender/windowmanager/intern/wm_operators.c