Blender Git Loki

Merge branch 'master' into HMD_viewport

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c

small clean up (removed deprecated variable)

Fix 3D views sharing viewport engine after splitting/duplicating

Some UI changes for new viewport engine dropdown

* Use legacy viewport as default for now
* Remove "Use Modern Viewport" option
* Minor cleanup

Implement generic draw-modes and draw-plates for viewport engines

Also made the new viewport use these (at least a default mode with a number of default plates).

This draw-plate design is more generic then the previous hardcoded one, it stores the plates in mutable lists which can be stored as presets (draw-modes). We can further add sub-plates and process callbacks for plates that need additional data processing or don't do any drawing.

Use viewport engine for drawing new viewport

Only basic transition, objects are not drawn yet.

dynamic fracture, further minor transform tweak

Initial support for generic viewport render engines

Adds a basic API for managing viewport render engines. This should make it possible to hook up external viewport engines in future (e.g. Hydra). Commit also includes some basic integration with View3D (including version patching) and RNA defines for exposing viewport render engine list in UI.

Code works really similar to normal render engine API, but I don't think we should merge them.

another minor tweak for transform issue

Move inline function defines into own source file

Merge branch 'master' into temp_localview_split

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

fix for dynafrac, disallow passive objects as triggers again (to avoid the ground being a trigger)

further attempt to fix / get the transform issues under control with dynafrac

Move manipulator drawing for new viewport into own function, add comments

Merge branch 'temp_manipulators_core' into custom-manipulators

Conflicts:
source/blender/editors/interface/resources.c
source/blender/editors/space_api/spacetypes.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/manipulators/WM_manipulator_api.h
source/blender/windowmanager/manipulators/WM_manipulator_types.h
source/blender/windowmanager/manipulators/intern/wm_manipulator.c
source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c

Merge branch 'blender2.8' into custom-manipulators

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c

Merge branch 'master' into temp-sybren-poselib

Merge branch 'blender2.8' into temp_manipulators_core

Merge branch 'master' into asset-engine

Apply patch on blender2.8 branch

Ended up just deleting temp_manipulators_core branch and recreating it from blender2.8 branch. Applied D2232 on it then.