Blender Git Loki

Clip: Check memory allocation during prefetch

Aimed to make prefetching more stable for cases when
it causes Blender to run out of memory.

Codestyle: Indentation

Fix: OpenCL Displacement and light sampling

The bake kernels are also used during mesh displacement and light
importance sampling. We disabled the implementation of these kernels
when baking was not enabled.

Fix redo regression w/ transform constraints

Adjusting a constrained transform would always use global space.

Fix transform reading all ob-data as a mesh

Tool: Use scale keymap for scale cage tool

Needed so clicking anywhere performs uniform scale.

Theme: update blender-light theme clipping border

Color was too dark compared to the background color.

makesrna: Fix build error on windows.

rB94f83a4ebd929e7c4f405b1c78d9db842dfe1689 introduced a dependency on pthreads
but did not add it to the linker inputs.

Keymap: add context menus for paint modes

These are place-holders with only a few items in each, as with the rest
of the context menus they need to be populated & organized.

Weight Paint 'weight' shortcut has been changed from W to Ctrl-F,
to co-exist w/ the context menu shortcut.

Fix assert w/ multi-dimensional array printing

Own oversight adding assert, result from MEM_allocN_len may be padded.

Keymap: Ctrl-Home/End to set start/end frame

New shortcuts for the dope-sheet.

Fix T61563: Info space prints matrices as flat tuple

Add support for printing multi-dimensional arrays.

Fix T61765: thread-unsafe logging used

Merge branch 'blender2.7'

Cycles: Fix uninitialized number of hits

Was happening when looking for all intersections for transparent shadow rays
in the case the ray is degenerate.

Still quesitonable whether we should consider this a transparent or opaque
configuraiton. Ideally, we should prevent such rays from happening, but that
is another vector of debugging.

Units: Use units for smoke

-Use factor for flame_vorticity, slice_depth, density & volume_density
-Use distance for surface_distance
-Use factor for mix factor in Data Transfer modifier
-Use prop_translation for pivot constraint offset

Units: Use correct units for transform operators

-Use distance for Shrink/Fatten Distance
-Use factor for Smooth Factor
-Use Factor for Randomize Uniform and Normal values
-Use Distance for Randomize distance amount
-Randomize Transform Scale was wrongly using distance

fix T61122 : Collada exporter exported alpha value (always 0) from deprecated material attribute

cycles/opencl: Fix compile error.

added missing quote, introduced in rB15edda3a8e07003bef695cca939744bbea80ad18

Merge branch 'blender2.7'