Blender Git Commits

New option for the particle Add brush: `use_add_stroke` to toggle
between stroke and single-add mode.

This was requested especially for use with tablets. With a pen it is
difficult to set a precise point and the tool ends up making multiple
hairs close together all the time. Disabling the stroke option helps
adding individual hairs.

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Ultra hacky fix for sequencer:

Avoid opening the file when doing uncached reading because ffmpeg takes
quite a long time to read the first frame. Instead, avi jpeg is almost
instantaneous here.
This will leave the anim struct without an Imbuf and that can cause
other unexpected issues elsewhere so commiting on gooseberry first
to try.
Speedup is quite impressive though.

Needless to say, code here quickly becomes a mess and the proxy system
should be made saner but for now just commit to keep things working at
the studio.

Added missing blenderplayer stubs for new particle edit shapekey
functions used in RNA.

Merge branch 'master' into gooseberry

Disabled the child hair hull drawing feature.

This is incompatible with particle data structures in their current form.
Hull drawing requires sorting child particles based on the distance from
their primary parent. However, this changes the order of children, which
is the main method of generating random numbers for them. In the
viewport this is not a problem, but when rendering the children are
constantly recreated, using the respective deformed emitter mesh each
time. This leads to changing child orders when using the convex hull
sorting, and therefore different randomisation values.

To properly implement child hull drawing we would have to generate a
stable parent-child offset metric as well as avoiding any resorting in
the actual data arrays. This in turn requires terribly inefficient
drawing iteration, which could become a bottleneck by itself even before
taking cache coherence or OpenGL optimization requirements into account
(collecting child data into a dedicated buffer for drawing).

Comment out the proxy fix to test if it makes things better,

Merge branch 'master' into gooseberry

Quick test to figure out performance bottleneck in gooseberry.

Failed proxies will now attempt to fetch a smaller proxy first before
fetching the full resolution. This might allow us to see if we are
hitting a bandwidth issue (due to high res) or a file query issue (due
to more file queries)

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Wire-color was accidentally broken in a merge

Adding back changes to background needed for auto-contrast.

Support for the (still experimental) parent coloring mode in regular
strand drawing.

Parent coloring is currently still entirely random, but can be improved
for all use-cases later.

Apply shape keys directly to the hair key data, instead of only applying
to the hair dynamics input DM.

Also this calculation has to happen before caching paths, otherwise
there is a 1-update lag because parent paths still use old values.

After editing hair, apply the changes back to the active hair shape key.

This makes shape keys for hair actually usable by completing basic edit
mode integration.

Apply hair shape keys to the particle base data when entering edit mode
and when switching the active key during edit mode.

This is different from how shape key editing works on meshes: there the
edit data (BMEditMesh) stores customdata layers for shape keys, then
writes them back to the mesh. The hair edit mode is a lot more messy and
confusing, it has to update the base data immeditately (with potential
consequences for undo ...)

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Initialize new hair shape keys with data from the current particle keys.