Blender Git Commits

Merge branch 'master' into asset-experiments

Previews: use a ghash to store previews of every path.

Simpler, sanier, and avoids Icons to have to own ImagePreview data even!

Merge branch 'master' into ui-preview-buttons

Merge branch 'cycles_memory_experiments' into gooseberry

Cycles: Add debug option to disable pre-aligned triangles storage

This option makes it so BVH does not use pre-aligned storage for triangle vertex
coordinates which was originally needed for faster coordinate lookup when doing
triangle intersection test. This array gives up to 10% performance comparing to
fetching individual coordinates but it also used 12 floats per BVH primitive,
which might translate to quite huge array in a complex scene.

Intention of this option is to investigate if this is a right direction to make
gooseberry files being able to render on local farm which is not totally great
in memory.

Current approach is not totally cheap, meaning even the case with the storage
enabled might be slower, but currently it's within 1%.

Merge branch 'alembic' into gooseberry

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

Use BLI_assert instead of assert

Use our own allocation routines for GPUx module

Merge branch 'master' into gooseberry

Merge branch 'master' into GPU_data_request

Conflicts:
source/blender/makesdna/DNA_view3d_types.h

ImagePreview: merging changed and user_edited into a single flag

"Deflector" force modifier for cache simulation.

This works like the existing effectors when using "surface" mode: It
selects the closest point on the mesh surface and creates a force based
on distance and falloff.

Unlike the old effectors it also supports signed distance, based on
the surface normal, which gives more control over the allowable distance
of strands to the mesh surface.

add to GPUx state: interpolation (smooth shading)

and remove manual calls to glShadeModel.

TODO: interpolation qualifier per attrib (flat/smooth/noperspective)
instead of here.

This requires GLSL 1.3 (OpenGL 3.0) or EXT_gpu_shader4 so we canâ??t go
down that path yet.

remove short int -> float conversion for vertex normals

Performance experiment â?? thought this might be slowing down large
shaded meshes on Mac + nVidia but it was not. Index buffers in VRAM
fixed the perf issue :)

Keeping normals as GL_SHORT uses less memory. Would be 1/2 but
padding/alignment makes it 2/3. These stay GL_SHORT in VRAM also, and
are converted to floats when loaded by the vertex shader.

Atomic ops: return value of *add* and *sub* consistent across OSes.

The Windows and asm variant were returning the value, of the variable
before the add or sub operation. All the other variants were returning
the value after the operation. Now all variants return the new value.

BGE DeckLink: support capture in Linux - part I.

Capture works: I can see the frame coming in but passing them to the GPU
doesn't work yet. I'm using standard OGL function though.. TBC.
them to the GPU.

fix compiler warnings (gcc 4.9)

store index buffers in VRAM

With this change, smooth solid meshes draw faster in the new viewport
than old with VBOs.

Wireframe was already faster, now it's CRAZY fast.

New cache modifier type for creating force fields on duplis of the
cached group itself.

This allows using the dupli group objects themselves as force fields,
in particular for collision objects in strand simulation. Without this
feature only the original objects of are recognized by the effectors
system, and even if duplis worked properly their settings would not be
accessible due to linking and dupli group hiding. The cache modifier
circumvents this issue by providing a new force field system, separate
from the current effectors.

Merge branch 'master' into ui-preview-buttons