Merge branch 'master' into free-refcount-ids
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 8 Oct 2015 10:03:03 +0000 (12:03 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 8 Oct 2015 10:03:03 +0000 (12:03 +0200)
commit249aa6c64907ede8f86e085e538b23881b19cb25
tree5210ae17473b7680871a8d2147ec0c2916c2bb23
parent913938514d682990ea9b0aebf90574bfe96f43a8
parent97b6948181df4ee97296ec45aebc75f31b7c790a
Merge branch 'master' into free-refcount-ids
source/blender/blenkernel/BKE_key.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/sequencer.c