Blender Git Loki

Cycles: Fix wrong ifdef check around shadows record all

Fix off by one error drawing passepartout

Fix T42065: Shading issue using Array modifier

Gah... Dirty normal flag should be set on *real* final dm, after merge is done. :/

OSX: simplyfy last commit for fs_menu system_bookmarks

OSX: Change the FS_CATEGORY_SYSTEM_BOOKMARKS aka "Favorites", so that the orderwise in sync with finder

Fix for tgz script (whitespace broke it)

Expose epsilon (precision) prop to user, for raycating against verts/edges it's absolutely needed!

Cycles: correct math wrappers

include the parens around value before cast,
in some cases was causing double/float promotion by only casting the left value.

Conflicts:
intern/cycles/kernel/kernel_compat_cpu.h

Merge branch 'master' into terrible_consequencer

Add space for facegroup storage

Merge branch 'master' into mesh-transfer-data

more ifdef WITH_OPENEXR

Grease Pencil layers in the DopeSheet now show interactive color swatches beside the layer name now

Updated "Frame" menu to show all the operators which work for Grease Pencil mode

Code Cleanup: Make it easier to reuse code for drawing settings of GP Layers

Code Cleanup: Split onion skinning drawing code out into its own function

Merge branch 'master' into GPencil_EditStrokes

Sequencer: OpenGL preview and OpenGL render working correctly

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

Note: this also includes some house-keeping in the image_buttons.c to
handle the recent changes in the file.

Conflicts:
release/datafiles/locale
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_image/image_buttons.c

Sequencer Multi-View/Stereo 3D initial commit

What works:
* Scene strips.
* Any non-image strips.

What doesn't work well:
* OpenGL Render (and preview) from sequencer is buggy (it doesn't use
the correct camera shift). It's particularly bad for Stereo 3D.
* Right now there is no way of previewing only a view (e.g., left)
in a way it's the same we do with the Compositor backdrop.

What doesn't work yet:
* Any image or movie strip (they work as mono at the moment).