Blender Git Commits

Merge branch 'master' into GPencil_Editing_Stage3

Conflicts:
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_sculpt_paint.c

Merge branch 'master' into GPencil_Editing_Stage3

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

Fix: Transforming GP Keyframes in DopeSheet was no longer possible when in EditMode

This was a consequence of the hack used to ensure that the jump keyframes operator
could correctly use GP keyframes when in the timeline and action editors.

Fix: GPencil snap cursor to selected wasn't working

Min-max weren't getting initialised correctly, causing this to fail.

GP Editing: Snapping Tools (Shift S)

This commit introduces the ability to snap GP points to the cursor/grid,
as well as snapping the cursor to GP points. Currently this functionality
is only available in the 3D view (since the cursor/grid settings are only
available in that view), where they are most needed.

Later, some of these operators can be extended to other editors on an
"as-needed" basis, based on finding some way of dealing with the lack
of 2D cursor in those views.

Coded during my recent travels :)

Fix small compile error noted by Sybren

GPencil: Proper fix for proportional editing not working

Stop-Gap fix: Proportional editing was broken in new files for GPencil

Looks like my earlier commit wasn't quite right. For now, just reverting these
so that I can use this build for Siggraph; will look into a better fix later.

(The problem seems to be that the gp flag is getting auto-set too late - needs
to be done in initTransInfo() for the prop edit to take hold)

Fix: GP Sculpt was no longer making copies of the current frame when being used non-modally

Ack! Compile fix for typo

Thanks pepeland for the fix ;)

GP EditMode: Tweaked poll callback for selection ops to work when the active layer is empty

GPencil Dopesheet Mode: Copy and Paste for Keyframes works again

For the first time since the 2.4x series, the copy and paste functionality for
Grease Pencil keyframes finally works again. Not only that, but it's now been
upgraded to include some of the new goodness supported by the 2.7x keyframe
copy and paste tools.

GP Editing: Transform Manipulators can now be used to transform GP points

Code Cleanup: Removed the need to set the "gpencil_strokes" property on transform ops when editing GP Strokes

Now that we've got a dedicated mode for this, we can now safely check this from
the context settings and set the relevant flags internally instead.

GP Edit Menus: Tweaks + Missing Items

* Added entries for shrink-fatten, sculpt mode, sculpt brush, and proportional editing
* Made the Convert and Move to Layer op entries into menus to save users a click

GP EditMode: Simplify the way that this is handled

Now, instead of actually altering the ob->mode flag, we just make the
object mode setter operator (and the header) delegate to the appropriate
GPencil things to do their thing if they wish first.

As a result, we don't have to worry about version patching or issues with
changing selected/active objects.

Merge branch 'master' into GPencil_Editing_Stage3

GP EditMode: Some more fixes for editmode handling to resolve some annoying corner cases

* Edit Strokes mode should only be available if there is actually a GP datablock
and it is in editmode
* If exiting strokes editmode with the active object hidden, the flag would not get
cleared, and it would appear that we were still in editmode.

GP Edit: Provide more direct quick access to sculpt brush via D+E pie

Added direct buttons to quickly change the sculpt brush when bringing up the
D+E pie menu for GP Stroke Sculpting. These are only included for the most
useflu of the brushes. All others are currently still visible via the
dropdown on the left (of the pie), though I'm considering removing that
to make things less confusing.

Missed this old comment in previous commit