Blender Git Commits

Animation Editor support for animating Grease Pencil settings

Merge branch 'master' into mesh-transfer-data

New customdata type for mesh surface samples.

Experiment: Some tweaks to the Grease Pencil pie menu layout

Split off selection tools and copy (+ a few others not previously included)
into secondary "Select..." and "More..." pie menus accessible from the first.
This helps balance out the menu more in order to have consistency between
edit and non-editmode (i.e. the toggle option is now always in the same place),
as well as opening up more space for new tools to become accessible.

It does however seem a lot clunkier than the previous approach...

Reshuffling of extra tool settings

Previously it was necessary to expose the editmode and stroke placement settings
at the bottom of the settings panel when it was displayed in the Sequencer, as
the sequencer doesn't have a toolbar for hosting those settings.

This commit moves those out into a separate panel, which can be included in other
editors too. This applies to editors which have a toolshelf for displaying these
settings too (e.g. nodes editor), where the toolshelf is often collapsed, making it
valuable to be able to set these settings from more than one place.

(While not great from a long-term standpoint, such duplication is a "good enough"
solution in the meantime, until we figure out a better solution)

Merge branch 'mesh_samples' into hair_immediate_fixes

Conflicts:
release/datafiles/locale
release/scripts/addons

Merge branch 'master' into GPencil_EditStrokes

Switched the hair edit data to a bmesh-like structure for consistency.

This means using mempools to store curve and vertex data, which allows
arbitrary addition and removal of data more easily. Also this includes
an iterator system similar to bmesh iterators (although the simpler
topology makes it a lot less complex).

Merge remote-tracking branch 'origin/master' into multiview

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c

From review: leftover from d9d94d0c (remove viewname from RE_display_update_cb)

Merge branch 'master' into wiggly-widgets

From review: keep err_out at the end of draw_offscreen_imbuf*() routines

From review: all chars in blender are unsigned, no need special math
utils function just cast/call the _char functions

Depsgraph: Allow transforming animated objects

The issue was solved by skipping flush to animation component
when tagging ID block for an update. This seems to be reasonable
thing to do: animation should only be tagged directly when editing
in the animation editor or via the time source node update.

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/intern/gpu_extensions.c

Depagraph: proper relations for lattice modifier

Depsgraph: Cleanup, move helper functions to an anonymous namespace

Depsgraph: De-duplicate root ik solver bone find code

Depsgraph: Don't evaluate drivers/nla from action evaluation callback

From review: use !=0 when handling flags