Blender Git Loki

Fixes for view3d rotate axis snapping

- turntable would lockup when snapping, not allowing further rotation.
- userpref rotate-about-selection was ignored (causing strange panning)

Fix issue with texture painting: Tex slot scale was being applied twice.

Fix for own mistake: arc diff swallowed a commit somehow, breaking
compilation.

Switch Dyntopo enable back to Ctrl-D.

Grease pencil straight line can still be enabled by first pressing D
then Ctrl and looks like there is no final consensus on key shortcut.
Better leave this as before and solve after release.

Fix T37334: Better "internal links" function for muting and node disconnect.

Implements a more flexible internal connect function for standard nodes
(compositor, shader, texture). Allow feasible datatype connections by
priority.

The priorities for common datatypes in compositor, shader and texture
nodes are encoded in a simple function. Certain impossible connections
(e.g. color -> cycles shader) are excluded by giving them -1 priority.

Priority overrides link status: If a higher priority input can be found,
this will be used regardless of link status. Link status only comes into
play for inputs with same priority.

Reviewers: brecht

CC: sebastian_k

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

Fix for problem with fly speed, caused by other speed tweaks.

Found another place where nproc can be used

/proc/cpuinfo is a Linux-specific thing. Using GNU [[ http://www.gnu.org/software/coreutils/manual/html_node/nproc-invocation.html | nproc ]] should be more portable.

Reviewers: mont29

Reviewed By: mont29

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

Cycles: remove ccl_align macro for GPU as unused and unsupported in OpenCL

Fix for collapse ignoring pinned panels

Fix T38873: Crashing on undo of ocean modifier.

Issue of this bug is that most part of fftw is not thread safe, only compute-intensive fftw_execute & co are.

Since smoke was affected by this issue as well, a global fftw mutex was added to BLI_threads.
Audaspace also uses fftw in one of its readers (AUD_BandPassReader.cpp),
but this is not an issue currently since this code is disabled in CMake/scons files.

There was another threading issue with smoke, we need to copy dm used by emit_from_derivedmesh(),
as it is modified by this func.

Reviewers: sergey, brecht

Reviewed By: brecht

CC: brecht

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

Fix T38900: cycles OSL crash running getmessage("trace", "geom:name", name)

NDOF: add navigation modes to user preferences

also comment debug prints for raytracing

Fix for using non camera objects as a camera having zero area view-frame

Fix for some unlikely memory leaks, remove redundant checks

Resolve T38899: changes to Ctrl+Selectmouse conflict with LMB select

Fix for memory leak in particle brush

Fix Snap to Symmetry failing to select the vertex from the right side

Fix for own error with updating view2d for NDOF

Code cleanup: correct abs use and quiet warnings

Fix for baked FCurve subframe interpolation (bad abs use)