Blender Git Loki

Cycles: Make regular bvh traversal functions close to each other

Cycles: Re-group ifdef so we check for particular feature only once

immediate mode refactor: walk navigation cross

gawain update: immAttribute for 2i

immediate mode refactor: fly navigation square

OpenGL: fix GPU_SHADER_TEXT on non-Mac

Developed on Mac and committed quickly.. oops

Quiet warning with -Wformat-signedness

Is actually a redundant cast since Blender uses -funsigned-char, however I think it's fine to be explicit about it in new code so cast is required to make compiler happy. Am not a fan of -funsigned-char anyway...

Alembic: add support to interpolate transform matrices in-between
frames.

Cycles: Avoid conversion from bool to uint

Small speedup for blend_render_info.py

Do not close and re-open the file in case it's compressed, gzip module can now directly take a file object as parameter.

Differential Revision: https://developer.blender.org/D2235

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/writefile.c

Fix T49391: Texture paint is not aware of disabled color management

There might be some extra missing points here, but it's all rather
a TODO than a real bug and can be tweaked further once issues are
actually discovered.

Fix T49343: ImageFormatSettings were not setting their rna struct path correctly

Reviewers: brecht, mont29

Reviewed By: brecht, mont29

Subscribers: brecht, sergey

Differential Revision: https://developer.blender.org/D2228

Fix T49408: OpenGL light widget breaks viewport shading

Fix T49386: Blender crashes when told to load an OCIO LUT that does not exist

Merge branch 'master' into soc-2016-multiview

Merge branch 'master' into temp_localview_split

hooked up blender kernel code to work with obstacle adaptions in liquid script

Quiet compiler warning

Merge branch 'master' into soc-2016-layer_manager