Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jun 2018 14:18:15 +0000 (16:18 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jun 2018 14:18:15 +0000 (16:18 +0200)
commit56173e512cab020a5bc96e6d3069641a03d47fbe
tree112fcb93a1898fadb34c2b74ae32471a6364a969
parent6855d537e3112f7ba4d84524d06a524b0ea9f7b1
parenta0a1fc89387f0f1396b5e4320c2dd4a6fedd1c25
Merge branch 'master' into blender2.8
19 files changed:
source/blender/blenkernel/intern/cachefile.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/studiolight.c
source/blender/blenkernel/intern/writeavi.c
source/blender/blenloader/intern/readfile.c
source/blender/collada/DocumentExporter.cpp
source/blender/editors/interface/interface_icons.c
source/blender/editors/io/io_alembic.c
source/blender/editors/io/io_collada.c
source/blender/editors/screen/screendump.c
source/blender/editors/sound/sound_ops.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/freestyle/intern/application/Controller.cpp
source/blender/python/intern/bpy_interface.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/blender/windowmanager/intern/wm_files.c
source/creator/creator_signals.c