Blender Git Commits

Update/correct version patching

Fixes for WITH_OPENHMD and WITH_INPUT_HMD options

And cleanup.

Cleanup: Undo whitespace changes, comments, etc

Merge branch 'master' into HMD_viewport

Adjust opening position and size of HMD window

Fix streched viewport in camera view

Various cleanup

Merge branch 'master' into soc-2016-layer_manager

Conflicts:
source/blender/blenkernel/intern/softbody.c

Fix T48991: some particles emitted at a distance from object.

The cause seems to be that despite dt_frac being computed as
1/(subframes+1) with integer subframes value, it doesn't always
add up to exactly 1.0 due to precision limitations. If the sum
is similar to 1.00000???, the last subframe is skipped, and all
particles that were supposed to be emitted in that interval are
emitted next frame, with the code working incorrectly due to
skewed time range.

To fix, separate the code from the dynamic timestep feature that
adjusts the last subframe length into a separate function, and
use it even when dynamic timestep is disabled.

Curves: Fillet operator

Forget the last one. This commit contains a formal mathematical fillet operator.

Curves: Fillet operator

Implemented a fillet operator. This operator is everything but mathematically correct (to get a radius 1 fillet, you need to input radius 1.73; endpoints do not match), but it achieves a nice visual result.

now using new behavior outflow flags instead of outflow type flags

Cleanup: Use 4x4 matrices, naming, compiler hints, use API function

Merge branch 'master' into HMD_viewport

Conflicts:
intern/ghost/intern/GHOST_System.h
source/blender/blenkernel/intern/camera.c
source/blender/blenkernel/intern/screen.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c

Reset writefile.c to earlier state to avoid merge hell

Was caused by whitespace auto-cleaning.

Fix linking with Blenderplayer enabled

Implemented initial support for using HMD projection matrices in blender viewport.
Also did some general cleaning

more outflow ui customizations

Curves: Offset and Chamfer operator

Commented out the mouse functionality. Code for handling keyboard input needs to be added. Once it is added, the invoke and modal functions are ready to go.

added smudge to wpaint. Fixed some strength issues with wpaint. Still need to add spray support.