Blender Git Commits

updating force_fields on per-step basis

Merge branch 'master' into hair_system

Fixed missing scons include folders for Bullet in the hair code.

Expose friction and restitution of hair in the UI.

Basic collision response for hairs with other objects.

This only includes a restitution force atm, so the hair just slides
sideways over meshes. Friction forces and detailed collision settings
still have to be added for giving more control.

Fix for stretch forces, were disabled by merge error.

remove unused import

Merge branch 'master' into pie-menus

remove accidental committed file

updating force field on smoke_process

More optimization: Allocate all LinkNode need for loops in one step, instead of doing one alloc per loop.

This allocate a bit more memory than needed (since we won't use linknodes of 'sharp' loops),
but avoids calling BLI_linklist_prepend_memarena() once per 'smooth' loop.

Note: gave much less benefits than expected, in the end - guess memarena allocation is *really* fast!

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

New Stereo Image Output options (work in progress)

Now there is a new menu to let the user pick whether to export the image as Individual images, or as Stereo 3D.
The only mode currently working is Anaglyph (and it goes better with RGBA output).

It includes a big refactor of my original approach to save_image_doit

I'm wait to decide the best design with Sergey before implementing the other modes (and finishing anaglyph to handle all cases, spaces).

exporting wind force

addForceField method in mantaflow added

Caching for bullet contacts with the hair system.

This makes the hair code a bit more independent from Bullet details when
handling contact information later on. Also we can then quickly loop
over contacts for repeated iterator steps without having to filter the
persistent manifold points cache again and again.

Merge branch 'master' into temp_custom_loop_normals

Switch clnors data from float[2] to short[2].

Suggested by Campbell, saves memory and does not make things slower (perhaps even slightly faster),
even though it asks for a few more operations...

Note the way alpha factor is handled is a bit different now, since with shorts it's simpler to
always keep factor-like value in the 'virtual' [-1, 1] (real [-SHRT_MAX, SHRT_MAX]) range.

Code is a bit more verbose, since we do not have much math helpers for short 2d vectors,
but this is a detail that can be solved later.

Some cleanup and restructuring of the integrator code.

This divides the integrator loop more clearly into distinct steps, i.e.

= Outer Loop =
> detect collisions (todo)
= Inner Loop =
* calculate internal forces
* calculate external forces
* handle collision responses
* calculate damping
> update state
> synchronize threads (not needed yet)

Change template to an edit mode selection pie menu.