Blender Git Loki

Lookdev: Renamed RNA

studiolight_background => studiolight_background_alpha
Removed "Show" from the label

Studiolight: Background Generation of icons

Show cached frames in timeline at correct height

The line was covered by the horizontal scrollbar instead of drawn above
it.

RigidBodyWorld: copy ptcache from evaluated scene back to original scene

This makes it possible to perform re-evaluation of the scene without
having to re-run the simulation.

The CoW�? Orig copy is only performed when the depsgraph is active, so
as to not influence the current scene while rendering in the background.

Alternatively, we could have the CoW copy share the cache with the
original to prevent too much copying of cache data. This will be faster,
but I'm not sure whether we can reliably check the DEG_is_active()
status at CoW copy creation time.

Fix T55528: Cycles AO node should default to 1 if radius is 0.

Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/sculpt_paint/paint_image_proj.c

Cleanup DM generation code for ProjPaint.

Two branches were actually doing essentially the same thing here, no
need to artificially complicate things. ;)

Fix (unreported) unauthorized relesing of derived_final DM in paint projection code.

NEVER free yourself DM returned by mesh_get_derived_final(), it's always
to one assigned to ob->derived_final!

Cleanup: rename mode -> object.mode in Py UI

Keep 'mode' only for 'context.mode'.

Error in last commit

UI: move object-mode lock out of the 3D header

Avoid obscure options here.
Move to the edit menu, although this may be temporary.

Studiolight: Add SH2 cache

- the result of the SH2-coeffiecients are stored in a bin file (3*9
floats). As the file is a local file we do not care about the
architecture.
- solved issue that also for internal lights the irradiance file were
stored. We don't want that as it could be in a not accessible location

Merge branch 'master' into blender2.8

Vertex Paint: set sculpt object mode immediately

SculptSession.mode_type wasn't initialized until painting,
making it unreliable for checks in other parts of the code.

Also remove unnecessary initialization,
matching sculpt mode more closely.

Merge branch 'master' into blender2.8

editorconfig: correct C/C++ using space

Ghost: Fix offline OGL render on windows.

rBe0c088f8fb5a introduced offline rendering support on windows, sadly it was trying to use the desktop window for getting a context, which given SetPixelFormat can only be called once for any given HDC was an unfortunate choice.

This patch uses a temporary hidden window for getting the opengl context.

Reviewers: mano-wii

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

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

make.bat: Fix msvc-2017 detection.

D3485 by @manung

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

Cleanup: code-style