Blender Git Commit Log

Merge remote-tracking branch 'origin/master' into multiview

So many conflicts ;) well, we survived the Viewport Shader project
merge

Conflicts:
source/blender/blenkernel/BKE_camera.h
source/blender/blenkernel/intern/camera.c
source/blender/blenloader/intern/versioning_270.c
source/blender/compositor/nodes/COM_ImageNode.cpp
source/blender/editors/include/ED_view3d.h
source/blender/editors/render/render_opengl.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_camera.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c