Blender Git Loki

Fix error after merge

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/editors/gpencil/gpencil_data.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/util/undo.c

Merge branch 'master' into blender2.8

Merge branch 'master' into blender2.8

- Undo that changes modes currently asserts,
since undo is now screen data.

Most likely we will change how object mode and workspaces work
since it's not practical/maintainable at the moment.

- Removed view_layer from particle settings
(wasn't needed and complicated undo).

Correct accidental changes by C Logging addition

Error in 891c1cfc9a3

Resolve unsigned comparison error w/ MSVC

Cleanup: remove global header

Cleanup: warning

Removed by accident in last commit

Undo: unified undo system w/ linear history

- Use a single undo history for all operations.
- UndoType's are registered and poll the context to check if they
should be used when performing an undo push.
- Mode switching is used to ensure the state is correct before
undo data is restored.
- Some undo types accumulate changes (image & text editing)
others store the state multiple times (with de-duplication).
This is supported by checking UndoStack.mode `ACCUMULATE` / `STORE`.
- Each undo step stores ID datablocks they use with utilities to help
manage restoring correct ID's.
Needed since global undo is now mixed with other modes undo.
- Currently performs each undo step when going up/down history
Previously this wasn't done, making history fail in some cases.
This can be optimized to skip some combinations of undo steps.

grease-pencil is an exception which has not been updated
since it integrates undo into the draw-session.

See D3113

BLF: Remove debug print

"this is not the commit you're looking for"

BLF: Fix Vertical/Horizontal layout switch.

This was breaking the first drawcall after a simple/non-simple shader
switch.

UI: Perf: Batch icons drawcalls together.

For this we use a new shader that gets it's data from a uniform array.
Vertex shader position the vertices using these data.

Using glUniform is way faster than using imm for that matter.

Like BLF rendering, UI icons are always (as far as I know) non occluded and
displayed above everything else. They also does not overlap with texts so
they can be batched at the same time.

BLF: Perf: Do not call FT_Set_Char_Size every time.

Using FT_Set_Char_Size is slow. Calling it only when needed is more clever.

BLF: Perf: Add a kerning cache table for ascii chars.

This adds less than a megabyte of mem usage.
FT_Get_Kerning was the 2nd hotspot when profilling. This commit completly
remove this cost.

One concern though: I don't know if the kerning data is constant for every
sizes but it seems to be the case. I tested different fonts at different
dpi scalling and saw no differences.

BLI_sort_utils: add pointer sorting callback

Also rename Pointer -> Ptr

Fix color names for monkey

The colors were missing after save and load again.

Cleanup: Move all Shader creation to engine_init

updated adaptive time stepping

moved adaptive stepping loop out of manta simulation (python) and into big step (update flows + update obstacles + manta simulation) (blender c)

Merge branch 'master' into soc-2017-normal-tools