Blender Git Loki

Merge branch 'master' into temp_bmesh_multires

Merge branch 'master' into sculpt-dev

Sculpt dyntopo: fix bug with automasking being needlessly initialized

Sculpt dyntopo: fix symmetrix undo bug from last commit

fix type of code line being after the parenthesis
instead of before

Sculpt dyntopo: BMLog now uses the new bmesh unique id system

A few notes:

* MESH_ID layers are not saved on conversion to Mesh unless
you ask for it in BM_mesh_bm_to_me's params.
* Still need to test the box/lasso trim tools.
* Need to find some way to test loop/edge ids, which aren't
used by dyntopo.

Sculpt dyntopo: Added a function to add multiple customdata
layers to a bmesh at once. Helpful since bmesh customdata
layers are allocated in single blocks, thus adding
layers individually can lead to lots of memory
copying.

Sculpt dyntopo: Added (optional) support for unique mesh id tracking in
bmesh

* System is per element type. So you can have unique ids for verts and
faces, but not edges and loops.
* Supports an optional id to element lookup table.
* Uses single id space for all elements
* Added a new CD_FLAG_ELEM_NOCOPY flag to tell
customdata_bmesh_copy_data to ignore that layer.
* IDs are stored as a temporary customdata layer with
CD_FLAG_ELEM_NOCOPY set.

Merge branch 'master' into temp_bmesh_multires

Sculpt Dyntopo: Fix memory corruption in dyntopo undo

ss->active_XXX_index wasn't being handled properly.

Dyntopo sculpt: add support for asan to mempool

Sculpt Dyntopo: fix bug in dyntopo brush spacing.

Sculpt dyntopo:

* Got automasking to work with dyntopo properly.
- AutomaskingCache->factor
has been replaced with the new temp layer API (which works for all
PBVH modes).
- AutomaskingCache->factor is, however, only initialized for
topology and face set boundary modes (if DynTopo is enabled)
since it's probably better to calculate the rest dynamically
in that case.
* Fixed stats bug

Twist brush: use relax instead of smooth

Merge branch 'master' into temp_bmesh_multires

Twist Brush: Add separate smooth step

Twist Brush: Fix bug in rotation

Twist Brush: Scale brush tip space per vertex

Twist Brush: Deform rotation space

Twist Brush: Rotate in brush tip space