Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Thu, 5 Apr 2018 14:58:41 +0000 (16:58 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Thu, 5 Apr 2018 14:58:41 +0000 (16:58 +0200)
commit57329304b061efe756e3a4ce1b828e9a7c7f7030
treec4a3f9ec01c09314fac7bcb99b437bf0920d19a3
parent3eaf77fdd34bd9517b650cabde3574361bdc8d21
parentea0e2f9bd3849b73a29ef1805988fdb0484bc9d4
Merge branch 'master' into blender2.8
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/editors/screen/area.c
source/blender/imbuf/intern/thumbs.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_movieclip.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/pipeline.c