Blender Git Commits

Merge branch 'master' into cycles_disney_brdf

bug fix: phiinit grid was not initialized to null

Merge branch 'master' into soc-2016-multiview

separating panning fields to RegionSpaceClip

- each sub-region now has its own zoom and panning
- leave stabilization fields in SpaceClip as-is.

recover view when changing from correspondence mode

using inflow flag to control when to apply inflow

Use new local view system for viewport and View3D context iterators

customized outflow function to account for liquids

seperate zoom from SpaceClip to RegionSpaceClip

- mark zoom in SpaceClip as deprecated
- known issue: versioning is not done

Merge branch 'master' into asset-engine

Conflicts:
source/blender/windowmanager/intern/wm_files_link.c

small fix for loading possibly different jack shared library versions on different linux distributions, thanks to sergey for the fix

New (stub) method for solving constrained hair editing with Lagrange multipliers.

Merge remote-tracking branch 'origin/master' into soc-2016-uv_tools

Merge remote-tracking branch 'origin/master' into soc-2016-uv_tools

Always cache the original strand vertex locations during editing.

True constraint resolving for length and contacts will need this information.

Move displacement options from mesh settings to material settings

Displacement is now a per material setting, which means old files will have to
be updated if they had used displacement. Cool side effect of this change is
material previews now show displacement.

Merge branch 'master' into soc-2016-multiview

Merge branch 'HMD_viewport' of git.blender.org:blender into HMD_viewport

Undo accidental change

Viewport HMD integration using OpenHMD

= Viewport HMD integration using OpenHMD =

This adds initial support for controlling the viewport view using a head mounted display (HMD).

To use it, go to the Properties Editor, Render Layers context. Enable Views, select "HMD View". You can then open a new HMD Window from there and start a HMD session.

**TODOs:**
* Move HMD options to a better place, they are not Render Layer related (Maybe properties region?)
* Zoom and pan don't work in HMD window while in camera view
* View streched vertically in HMD window while not in camera view
* TODOs/XXXs marked in code (esp. WM_ calls in BKE_)
* Apply D1350 for better mouse interaction while in HMD view

Reviewers: sergey, dfelinto

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