Blender Git Loki

Widgets:

* Move lamp operators to a proper place
* Store a list of widgets to avoid polling too many times
* Fix wrong indices when widgetgroup was not used.
* Lamp widget now uses an arrow widget. This will be refined to make a
nice prototype for operator/widget interaction.

Merge branch 'master' into pointcache

Conflicts:
release/scripts/startup/bl_ui/properties_physics_common.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/BKE_pointcache.h
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/physics/physics_pointcache.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_fluidsim.c
source/blender/modifiers/intern/MOD_cloth.c
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_particleinstance.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/WM_api.h
source/creator/CMakeLists.txt

Fallback for hair frame calculation from a single normal, in case the
normal is in Z direction exactly.

This should be considered a temporary measure, the tangent should be
defined more reliably by the mesh sampling system.

Add 'face smooth' flag transfer, and some minor cleanup.

Use a property to make the transform operator widget driven.

Design is still pending here, but for now just use to not remove widget
display.

Mesh islands: use MemArena to handle memory here as well.

Code cleanup: Generate error messages instead of failing silently

GP DopeSheet: It is now possible to set keyframe types for Grease Pencil frames

Use the R-key shortcut as for normal keyframes

Clean up/slight rework of mesh islands data.

Now it should be ready for future more generic usage - we might actually want to support
islands for arbitrary mesh elem types, not only loops for UVs/splitnors.

GP Onion Skinning: Custom before/after colours and ranges

It is now possible to set different colors for ghosts "before" and "after" the
current frame, and to separately control how many are displayed on each side.

To use custom colors, it is necessary to firstly toggle the color-wheel icon-toggle
(located beside the Onion Skinning) checkbox. This will make both before and after
strokes get drawn using custom colors. I tried having separate toggles, but that
was too clumsy.


TODO:
* Some version-patching code will be needed to initialise the colours and fields
so that they work when loading old files. I've reused the old field for the
"before" range, so that at least something will be usable there.
* Some code cleanup is in order to make this code a bit nicer

Made the threshold for selecting individual stroke verts more sensitive

That is, a wider around the cursor is now used when checking for matching verts,
which should make it easier to successfully select verts.

Merge branch 'hair_immediate_fixes' into hair_system

Conflicts:
release/datafiles/locale
release/scripts/addons
source/blender/physics/intern/BPH_mass_spring.cpp

Tweaks to GPencil keymaps again

* D RMB works as Eraser again. D Ctrl RMB was a bit too clumsy to remember
for doing this
* D Shift RMB is now the only remaining keymap for selecting stroke verts.
I've modified this so that it now properly toggles selections (while maintaining
previous selections too - it's trivial to change this behaviour in the operator
properties panel afterwards if you don't want that). This probably works well
enough as the only direct selection operator now?

Merge branch 'master' into GPencil_EditStrokes

Conflicts:
release/scripts/startup/bl_ui/space_view3d_toolbar.py

Change dial to something that resembles current rotation widget better.

Merge branch 'master' into hair_immediate_fixes

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

Mesh2Mesh mapping: switch to MemArena mem handling.

Merge branch 'master' into texture_nodes_refactor

Switch mesh bvhtree partial-building to use BLI_bitmap's.

Merge branch 'master' into mesh-transfer-data