Blender Git Loki

Typo in last commit

UI: Add user defined context menu

- Add/Remove from RMB context menu.
- Stored in user preferences.
- Access from Q key.

See T55027.

Ghost: Fix F12 render on windows.

createOffscreenContext left the new context bound to the calling thread
causing a race condition with the background thread doing the actual
rendering. see T55555 for a more detailed description of the problem.

this patch changes the behavior of createOffscreenContext to restore the
context to the calling context.

Reviewers: fclem

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

Fix z-depth error drawing new strokes

The new strokes must be on top of any other stroke.

Merge branch 'blender2.8' into greasepencil-object

Fix missing thickness when scale or mirror

The line was reset to minimum thickness when it was scale with -1 or the mirror transform was used.

enabled angular limits/stiffness/damping for plastic constraints (uncomment only)

Keymap: Add F3 key back for search

Keeping tilder, adding back F3 since some platforms
still don't have hardware scan-codes for tilder key on non-US keyboards.

enable angular limit/stiffness/damping settings for plastic constraints

in fact, only forgot to uncomment

Manipulator: fix issue refreshing transform tool

Changing manipulator types failed.

Merge branch 'master' into blender2.8

UI: alternate fix for empty context menu

block and layout could be NULL and checking this everywhere
wasn't practical.

Instead of lazy initializing, add UI_popup_menu_end_or_cancel
which cancels empty popup menus.

UI: naming of cursor options

Merge branch 'master' into soc-2018-hair-shader

Week 6 merge

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c

Blenfont: Fix texture not being initialized in recent refactor.

Caused some gpus to have issues with the font shadows.

thanks @fclem for helping tracking this one down.

Added UI for harden normals and normal control in bevel modifier

Merge remote-tracking branch 'origin/blender2.8' into temp-eeveelightcache

# Conflicts:
# source/blender/blenloader/intern/versioning_280.c

Eevee: LightCache: Add UI to control visibility of the lighcache data

For the moment we use a per scene setting for that. We could move it to be
per viewport (as an overlay).

Fix normal shading continuity for in-plane bevels