Blender Git Loki

Merge branch 'master' into greasepencil-object

GPencil: UI changes to Array modifier

- Replace Material by Material Override.
- Remove the separator between the rotation/scale triples and the random property.
- Add a separator after the rotation/scale props.

GPencil: Change Simplify RDP tooltip

GPencil: Patch Subdivision Simple option and fix buf in Tint patching

GPencil: Change Subdivision Simple mode to more clear UI

GPencil: Change Tint modifier

- Change factor increment to 0.01 and precision 2.

GPencil: Change Opacity modifier

- Replace UI text.
- Change factor increment to 0.01 and precision 2.

Merge branch 'master' into greasepencil-object

Merge branch 'master' of git://git.blender.org/blender

Merge branch 'undo-experiments' into undo-experiments-swap-reread-datablocks

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

use new 'unique realloc' of ID.

that way we do not have to stupidly ensure unique addresses of all IDs
read during an undo step, but only for those we actually need.

Combined with the 'almost always reuse old address' feature of undo swap
branch, this should ensure us to almost never call that code in
practice.

Merge branch 'master' into greasepencil-object

Fix assert position.

Merge branch 'id-ensure-unique-memory-address' into undo-experiments

Minor fixes/cleanup.

Merge branch 'id-ensure-unique-memory-address' into undo-experiments

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

Rework the whole unique ID system to also store ID addresses history in Main's mapping.

In the end, since this is a runtime/editing session data only, makes
more sense to store it here than in ID struct itself. And it's probably
also more efficient to handle.

Merge branch 'master' into greasepencil-object

CMake: Add macros for ignoring system libs

Start adding new macros to ignore system libraries when building with
precompiled libraries on Linux.

Merge branch 'master' into greasepencil-object