Blender Git Loki

Merge branch 'id_override_static' into asset-engine

Cleanup while attempting to fix auto-override detection in DEG.

Not sure why that piece of code stopped working, but now this operation
is pretty much never evaluated... Will have to either dig deeper in DEG
or ask Sergey about it, but not a crucial issue for now.

Auto-override detection: ignore animated properties.

Animation is by definition another kind of (dynamic) override of properties,
which supersedes static override.

Note that this could be debated in some corner cases ('differential'
animation, like dloc/drot/dscale), but think we can ignore that for now,
and expect user to handle those manually when needed.

Cleanup while attempting to fix auto-override detection in DEG.

Not sure why that piece of code stopped working, but now this operation
is pretty much never evaluated... Will have to either dig deeper in DEG
or ask Sergey about it, but not a crucial issue for now.

Auto-override detection: ignore animated properties.

Animation is by definition another kind of (dynamic) override of properties,
which supersedes static override.

Note that this could be debated in some corner cases ('differential'
animation, like dloc/drot/dscale), but think we can ignore that for now,
and expect user to handle those manually when needed.

Merge branch 'id_override_static' into asset-engine

Conflicts:
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/intern/wm_files_link.c

Merge branch 'blender2.8' into id_override_static

Conflicts:
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc

Restructure the hair modifier so external tools define guide curves.

Remap pixel scale parameter

The value for control point density was strange.

Compile fixes after merge

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/draw/modes/object_mode.c
source/blender/editors/include/ED_gpencil.h
source/blender/editors/space_view3d/view3d_draw_legacy.c

Merge branch 'master' into soc-2017-normal-tools

More rampaging cleanup & refactor in new clnor editmesh/transform code.

Also added loop_index to TransDataLoopNormal mapping, which allows us to
avoid another nasty loop-in-loop case.

Remove the new hair edit mode.

The purpose of this branch is to create a new hair system with a dedicated
grooming tool, unlike the current direct editing of hair guide curves.

The modified bmesh-based strand edit mode is quite complex and distracts
from the main purpose of the branch, so its better to remove it for now
and implement a new tool.

Cleanup: Fix compiler warnings

Cleanup: Supress compiler warning

Fix bug with transform_ui helper.

Fix/cleanup BM_lnorspace_invalidate().

This func can be made much nicer now that we store BMLoop pointers.

LNorSpaceArray: Ease access to loop in BMesh context.

Unlike 'regular' mesh, BMesh makes it really hard to get a BMLoop from
its index - it's designed to work in reverse, with passing BMLoop
pointers around, not their indices.

Henceforce, changed MLoopNorSpaceArray to support two kind of loop
storage, either indices (when used with regular Mesh), or BMLoop
pointers themselves (when used with BMesh).

Changes are luckily fairly simple and straightforward, so would not
expect too much issues here (quick tests seem to be all OK), and this
makes handling of clnors in BMesh context much eaiser (avoiding some
mapping or double-looping to get loops from their indices...).

For same reason, also added BMLoop pointer itself in TransDataLoopNormal struct.

There's still some (new) code to adjust/simplify, will be done in next
commits.

WIP: New parameters for brushes

More parameters to define how the stroke is stabilized.

This parameters maybe are not necessary on UI, but we need them now for testing different values.