Blender Git Loki

Code Cleanup: Make it easier to reuse code for drawing settings of GP Layers

Code Cleanup: Split onion skinning drawing code out into its own function

Merge branch 'master' into GPencil_EditStrokes

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

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.

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

CMake Build Fix: Forgot to add gpencil_select.c to cmake files

GPencil UI: Further cleaning up the UI to not show the "stroke placement" settings

Since we now show the "Stroke Placement" settings in the toolshelf (where available),
we can now afford to not show it in the properties too. The only exception for this
is the sequencer, where there is no toolshelf we can use.

Fix for error in previous commit: Layouts were not getting deactivated properly

GPencil Layers UI: Rearranging buttons for a nicer flow

Tweaks to RNA for GPencil pointers

Some tweaks to the RNA for Grease Pencil data pointers in an attempt to get
these editable via the Outliner datablocks view. It seems though that pointer
editing there is broken everywhere instead. Nevertheless, these tweaks should
make this handling more correct (i.e. refcounts are used accordingly).

For now, the best way of setting Grease Pencil data on objects, etc. is to do
so using Python

Grease Pencil Drawing: Default to storing on the scene when painting in 3D View

Grease Pencil will now draw on scene-level when drawing in the 3D view,
unless the active object has grease pencil data assigned (i.e. for files
saved in old versions).

The per-object method proved to be far too messy and confusing in practice,
as it was often all too easy to forget which object you had painted with.

While at present, the place where it stores strokes isn't able to be configured
from the UI yet, simply hooking up a Grease Pencil datablock into an Object's
Grease Pencil data slot should work (some tweaks are coming in the following commit
to add support for this)

Grease Pencil Layers UI: Ported properties panel to Python and UI Lists

This commit ports the Grease Pencil properties panel (which displayed the layers info)
to Python, and simplifies the design by using UI Lists instead of listing out the
contents of each layer inline. The resulting design is a lot more compact, and should
also be more easily scannable, especially when you have lots of layers.

For now, I've left all the old C-based layers code alone, but just commented out
in case we need to roll back this commit. So far, all the editors seem to be behaving
correctly, but I may have glossed over some details.

Added operator to move active Grease Pencil layers up and down the list

Added an operator to delete the active Grease Pencil layer

GPencil UI: Use the icons defined in RNA

GPencil RNA: Add icons for the toggle settings