Blender Git Loki

Fix T59910: material editor UI issue after recent changes.

This reverts part of commit 4f98266cf6, ref D4123.

Fix T59922: crash reading files with older renderlayers

- own error in rB2c196de56bbb163048b08f321983234a5e72e804
- now introduce RE_PASSNAME_DEPRECATED placeholder for old passes
- also dont allocate NodeImageLayers for these

Reviewers: brecht

Maniphest Tasks: T59922

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

GP: fix error after merge

Merge branch 'master' into greasepencil-object

GP: Fix error when merge 1 stroke only

Fix T59774: Lightmap Pack Error: Element-wise multiplication: not supported between 'Quaternion' and 'Vector' types.

GP: Rename GP_STROKE_RECALC_CACHE to GP_STROKE_RECALC_GEOMETRY

The GP_STROKE_RECALC_CACHE identifier was changed to GP_STROKE_RECALC_GEOMETRY because the previous name was confusing and could be confused with the recalculation of the Draw Manager cache.

Merge branch 'master' into soc-2018-npr

Merge branch 'blender2.7'

Conflicts:
source/blender/windowmanager/intern/wm_operators.c

Fix (unreported) broken Cycles tests after numaapi changes today.

Please always build tests when messing with build system/libs, am tired
of fixing that kind of issues...

Also, that fix is probably not working for standalone, no idea where's
the numaapi lib then, but committing since I need a building blender
here (with the tests, yes).

API Doc: point to blender2.7 new folder.

master is now for 2.8. ;)

Point API doc back to master one.

Now that 2.8 is master again...
Still have to update 2.7 thingy there, now (and update API doc site
accordingly, too).

Fix (unreported) broken Cycles tests after numaapi changes today.

Please always build tests when messing with build system/libs, am tired
of fixing that kind of issues...

Also, that fix is probably not working for standalone, no idea where's
the numaapi lib then, but committing since I need a building blender
here (with the tests, yes).

GP: More cleanup and renames

GP: Remove unused variable

GP: Avoid Onion calculation when play animation

Merge branch 'blender2.7'

Fix T59874: Cycles CPU 25% load only during rendering

The issue was introduced by a Threadripper2 commit back in
ce927e15e0e3. This boils down to threads inheriting affinity
from the parent thread. It is a question how this slipped
through the review (we definitely run benchmark round).

Quick fix could have been to always set CPU group affinity
in Cycles, and it would work for Windows. On other platforms
we did not have CPU groups API finished.

Ended up making Cycles aware of NUMA topology, so now we
bound threads to a specific NUMA node. This required adding
an external dependency to Cycles, but made some code there
shorter.

Fix T59865: UV editor vertex snap to active does not make any sense.

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

GP: Mew Merge Strokes operator

This operator allows to create a new stroke joining several stroke selected points of different strokes.

The new stroke will use the current material.

To use, first select the points to be merged. Optionally can remove the old points and strokes.

The operator is available in Edit mode in the Specials menu and Stroke menu.