Blender Git Loki

Merge branch 'master' into greasepencil-object

Cleanup: OCIO: Remove immVertexFormat in GLSL implementation

This was only needed for cycles/external engines.

Render API: Make external engine render in linear space for the viewport

This just replace the OCIO shader by a simple image shader without
color transformation.

OCIO: Use GroupTransform to avoid doing 3 transforms instead of 2

This exposes OCIO::GroupTransform to C api to be able to chain the
display transform with a corrective transform to output display linear
colors.

For now the display code only use an exponent transform to go back to
linear but should use a ColorSpaceTransform once we have the correct
config.

add utility function

fix compile error

Merge branch 'master' into functions

enable node tree optimizations

cleanup naming

fix typo

Volumes: show error message in panel when volume failed to load

pass buffer cache to functions via context

remove array allocator

try using BufferCache instead of ArrayAllocator

Support all 3D-view shading options for the VR session

Avoid own global variable, use existing DRWManager struct

cleanup

cleanup

Only cache framebuffers for layers that aren't always redrawn

restructure file