Blender Git Commits

Merge branch 'master' into terrible_consequencer

Cleanup: No point in passing all the implicit solver arguments
individually.

Cleanup: removed the unused olddV vectors from implicit solver data.

Revert "Gooseberry feature request, allow select left-right strips
operator to select all"

This change has been in master all the time after all, exposed the
operation better in master.

This reverts commit 799f974668004b3d2b7873f51951eb22b5fcf2f3.

Some more debug elements for hair collisions.

Extended line/face collision near-check, to allow for distance margins.

The original BLI method for line/triangle intersection returns false
in case the line does not actually intersect, but in order to generate
repulsion forces we need to also handle contacts inside the margin.

added weighted percentage, distance, angle

Revert "Terrible consequencer: commit to test requested feature by gooseberryteam."

This reverts commit 982d045e624201b4028186971189caa17cacff74.

Terrible consequencer: commit to test requested feature by gooseberryteam.

Gooseberry feature request, allow select left-right strips operator to
select all strips independently of channel of the active strip.

Fix crash when setting parent.

Merge branch 'master' into terrible_consequencer

Fix bounce/repulse calculation.

Merge branch 'master' into temp_custom_loop_normals

Conflicts:
source/blender/makesrna/intern/rna_mesh_api.c

Hair debugging: use "categories" (strings) for grouping debug elements
and support clearing for categories.

Fix for hair collision detection: need to use the second point of the
timestep segment.

This ensures the distance for a collision pair is the one of the current
point position, and the response gets calculated accordingly.

Filepath should include view even when rendering one view (if multiview is on)

When multiview is not used the filepath is as usual (e.g., Image.jpg).
When multiview is on, even if only one view is enabled the view is incorporated
into the file name (e.g., Image_L.jpg). That allows for the user to re-render
individual images.

Refactor to use view name instead of view id

This was is partly from the original code review round. At that time
Brecht Van Lommel suggested using names for the API instead of integers
(as we do for RenderLayers). I went a bit further and changed *most* of
the code to use strings.

The only parts that still use view_id are the ones closely related to UserImage.

That simplify the code and should make the code easier to understand,
review and maintain.

I tested many (if not all) of the supported areas, and apparently things
are working. But given the size of the intervention I wouldn't be
surprised if something stopped working, so please report.

Use repulsion forces in combination with the one-time penalty forces
in collision.

Fix for crash when going into particle edit mode with baked hair
simulation.

Note that this currently generates an extreme amount of points, by
making a edit pathcache curve for each hair in every frame! But at least
doesn't simply crash now.