Blender Git Loki

Merge branch 'hair_immediate_fixes' into hair_system_solver

Conflicts:
source/blender/blenkernel/BKE_cloth.h
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/versioning_270.c
source/blender/makesdna/DNA_cloth_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/physics/BPH_mass_spring.h
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/physics/intern/implicit.h
source/blender/physics/intern/implicit_blender.c

Merge branch 'hair_system' into hair_system_solver

Merge branch 'master' into hair_system_solver

Merge branch 'master' into hair_system

Merge branch 'master' into hair_immediate_fixes

WIP code reshuffling for widgets

fix for compiler errors due to obviously missing includes

pre-review cleanup part 2 (style, comment cleanup)

pre-review cleanup part 1 (until object.c, rest will follow in part 2)

Manipulator now uses the widget system (no operators used).

Widgets use a similar notification system as operators. It might be
worth using WM_BREAK messages like the rest of the handlers. For now
this should do.

Move manipulator handler to the widget system.

Draw manipulator from widget callback (handling still done separately)

DNA support for tagging individual stroke points as being selected

Code cleanup - Replace #defines with enums

Merge branch 'master' into wiggly-widgets

GPencil Strokes - D+M can be used to mirror strokes now

Revert "D765: Blender input method editor support for windows (diff #10)."

This reverts commit 1af29c666f2fdaf3de3128a4cd267a6f3ba108c5.

D765: Blender input method editor support for windows (diff #10).

Also merged rB8ddc3d148e9d8e55a5d64774e0a2a430f92bba59 to cleanly apply the patch.

Grease Pencil Dopesheet - Selecting channels in the dopesheet changes active layer

Fix: Node editor redraws properly after stroke selection changes