git.blender.org - blender.git/commit

projects / blender.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 49e7b77 2e71927)

author	Sergey Sharybin <sergey.vfx@gmail.com>
	Mon, 28 Aug 2017 09:27:50 +0000 (11:27 +0200)
committer	Sergey Sharybin <sergey.vfx@gmail.com>
	Mon, 28 Aug 2017 09:27:50 +0000 (11:27 +0200)
commit	f9f4e208713ec2b4fa8f8e112fb50cfd1ee6a266
tree	d20c41753ed01f847e3baab635d20fdfd058e0a3	tree
parent	49e7b77b1952c6ea4ab5064d0d31b54052301ffd	commit \| diff
parent	2e71927622ec7e25c400f23b58fd8d14e056482d	commit \| diff

Merge branch 'master' into blender2.8

19 files changed:

source/blender/blenkernel/intern/anim_sys.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/icons.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/material.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/object_deform.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/sequencer.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/readfile.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/animation/anim_filter.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/animation/keyingsets.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/object/object_vgroup.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/render/render_shading.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_outliner/outliner_draw.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_outliner/outliner_tree.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_time/space_time.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_ID.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_image.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_key.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_space.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_texture.c	diff1 \|	diff2 \|	blob \| history
source/blender/windowmanager/intern/wm_operators.c	diff1 \|	diff2 \|	blob \| history

The official Blender Foundation tree