Blender Git Loki

Merge branch 'master' into ui-preview-buttons

Git missed those last commit

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/interface/interface_handlers.c
source/blender/editors/space_sequencer/sequencer_draw.c

BGE VideoDeckLink: forgot one cleanup in last commit.

BGE VideoDeckLink: Minor cleanup in Windows implementation.

Merge branch 'alembic' into gooseberry

Make size calculation in cache archive info operators an optional extra
step.

This calculate can take a bit of time (some seconds to a minute in
tests), due to having to loop through all array samples. In many cases
only the basic structure is wanted.

Merge branch 'alembic' into gooseberry

Alembic: Fix wrong detection in Cycles whether cache is to be used for meshes

Alembic: Fix crash of viewport render with strands read from alembic cache

The issue was caused by RNA passing ownership from the cache data used by Blender
to Cycles. This lead to situations when all of a sudden blender looses data it
was expecting to have.

Now instead of passing ownership we're just copying strands from the data, so both
Blender and Cycles are having it's own local data.

Ideally this data will be shared between viewport and Cycles, but that's a bit
more tricky to do without modifying RNA API. Would happen eventually tho.

Merge branch 'alembic' into gooseberry

Conflicts:
source/blender/physics/intern/BPH_mass_spring.cpp

Enabled air drag forces in cached hair sim.

Use mass parameter for setting gravity forces in cached hair sim.

Alembic: Fixes for strict compiler flags

Alembic: Code cleanup, space around unused pointer function argument

cleanup my own recent stuff

Merge branch 'cycles_memory_experiments' into gooseberry

Cycles: Typo in triangle storage tooltip

reduce VRAM usage for flat normals

Reduce number of GL verts from (3 * tess_tri_ct) to (1 * loop_ct).
Attribute data formats unchanged.

stock Suzanne mesh
507 verts, 1005 edges, 500 polys, 500 faces, 1968 loops

mode = NORMAL_DRAW_FLAT

(3 * tri_ct) verts, vec3s normals (+padding)
GPUx batch size: 63886 bytes

(3 * tri_ct) verts, vec3s normals (no padding)
GPUx batch size: 58080 bytes

loop_ct verts, vec3s normals (+padding)
GPUx batch size: 45166 bytes

loop_ct verts, vec3s normals (no padding)
GPUx batch size: 41232 bytes

reduce VRAM usage for loop normals

Use GL_SHORT instead of GL_FLOAT for normal attribute. Savings scale
proportional to loop count.

stock Suzanne mesh
507 verts, 1005 edges, 500 polys, 500 faces, 1968 loops

mode = NORMAL_DRAW_LOOP

vec3f normals
GPUx batch size: 53040 bytes

vec3s normals (+padding)
GPUx batch size: 45166 bytes

vec3s normals (no padding)
GPUx batch size: 41232 bytes