Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 27 Nov 2017 13:08:35 +0000 (14:08 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 27 Nov 2017 13:08:35 +0000 (14:08 +0100)
commit408515810e99d40a6dd53c3d50f1e4be7eb52c87
tree0aaf16e6011b472bb3b12d92c996268b58ec3080
parent3bd6c8bfa256793170a21130d398c16da1192473
parent9b42b3e11462e96bf24970971ab181122c6b33df
Merge branch 'master' into blender2.8
15 files changed:
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/render/render_opengl.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/space_sequencer.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_camera.c
source/blender/makesrna/intern/rna_scene.c
source/blender/windowmanager/intern/wm_files.c