Blender Git Loki

Merge branch 'hair_immediate_fixes' into hair_system

Merge branch 'master' into hair_immediate_fixes

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

Removed unused line.

New hair editing feature "Shape Cut", for cutting hair based on a mesh
shape instead of a brush tool.

The brush cutting tool for hair, while useful, is not very accurate and
often requires rotating the model constantly to get the right trimming
on every side. This makes adjustments to a hair shape a very tedious
process.

On the other hand, making proxy meshes for hair shapes is a common
workflow. The new operator allows using such rough meshes as boundaries
for hair. All hairs that are outside the shape mesh are removed, while
those cutting it at some length are shortened accordingly.

The operator can be accessed in the particle edit mode toolbar via the
"Shape Cut" button. The "Shape Object" must be set first and stays
selected as a tool setting for repeatedly applying the shape.

SSAO works again. Unfortunately it's unavoidable to have it work without
explicit attenuation control (by using just max distance).

Also it now supports orthographic cameras properly. The maximum distance is
now defined in world space units so it should be slightly easier to understand
and uniform across perspective and orthographic cameras.

The optimizations can be generalized for orthographic cameras but the code is
more complex and the runtime advantage is questionable in that case
(in the end a matrix transform is 4 dot products which are not that terrible)
so commented out the code there for now.

Hack: Use same handling logic for finding "active" GPencil block in timeline as for 3D View

This is not a terribly nice hack, but it gives the behaviour that users expect
more often than not. Namely, this enables:
* GPencil keyframes now show up in timeline
* The next/prev keyframe buttons on the Timeline header work correctly
(i.e. they can "see" the GPencil keyframes)

Keymaps UI now shows stroke editing keymap

DKEY-Tab toggles GPencil Stroke Editing

UI: Add toggle for stroke editmode to sequencer properties panel (since it doesn't have a toolbar)

GPencil Editing: "Stroke Edit Mode"

Changed the way that the keybindings for the editing tools for strokes work,
to be less clunky to work with.

Now, instead of holding down DKEY, you instead enter "Stroke Edit Mode" (via
a toggle button in the "Edit Strokes" button in the toolbar). This enables a
keymap (Grease Pencil Stroke Edit Mode) which is only active when this setting
is enabled; the keybindings in this keymap are designed so that pressing the
normal hotkeys will affect the strokes as expected (instead of whatever else
may be in the viewport at the time instead).

Fix compiler warning from changing some types

Code cleanup: Port flags for bGPdata to a enum

Merge branch 'master' into gooseberry

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

Correct normal reconstruction with optimized formula.

This needed some adjustments from the formula I found on the article on
view space reconstruction, since OpenGL makes different assumptions about its
projection matrix.

SSAO does not work yet correctly under new model assumptions but we are going
to substitute with nice horizon based ambient occlusion.

high-res: inflow data passed in-memory, forces working

Refactoring of SSAO code. Uses some optimizations but result is different
still test file here to help with debugging.

Partial scons build files for pointcache library and Alembic
dependencies.

This is not yet functional, the Alembic linking is quite tricky.

Merge remote-tracking branch 'origin/master' into experimental-build

reordered functions and made them static in MOD_fracture.c, leaving out some unnecessary info for writing to blend in writefile.c (still have that read_struct memoryleak sometimes)

Merge branch 'master' into viewport_experiments