Blender Git Loki

Fix for wrong operator assigned to rotate widgets

Copy&paste stupidness

Extended Cycles to support both parent and child strands.

The code for syncing Strands and StrandsChildren data to Cycles curves
is almost identical, so to avoid code duplication a little templated
traits type has been defined, which provides the appropriate accessors
for both cases. This is very local and should not be too confusing.

Merge branch 'master' into wiggly-widgets

Revive the Manipulator Widget

Enabled the manipulator widget code again and updated it to the current
system to continue work on it.
A customizable manipulator widget might be a good start for a bone
widget system.

Merge branch 'asset-experiments' into asset-engine

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenlib/intern/BLI_filelist.c
source/blender/editors/space_file/filelist.c

Initialize per_thread_output_buffer_size based in render type

Cache reader for child strands.

This creates child strands along with the parents. These are not yet
deformed by parents or simulation, and are also not written back into
subsequent caches yet.

Store child strand curves alongside the parent strands in dupli object
data.

Child strands have their own struct type for vertices and curves to
avoid unnecessary overhead (parent curves store a full 3x3 matrix after
all).

Child strands may be constructed from particle pathcaches, or read from
curves data in alembic files.

state tracking API - reorder function args

in order of importance.

Doing this early, before itâ??s used in more places.

Player: new -a option to enable alpha on frame buffer.

A new option '-a' can be passed to the blenderplayer. It forces the
framebuffer to have an alpha channel. As the background color is applied
with 0 alpha, ImageViewport will return an image with transparent
background (provided alpha is set to True on the ImageViewport object).
This is useful in combination with DeckLink to generate a key frame
with transparent background.
Without the -a option, the frame buffer has no alpha channel and
ImageViewport always returns an opaque image, no matter what.
This should be working in Windows and Linux, but only Windows is tested at
present.
Note that although the frame buffer has alpha, the player window is still
rendered opaque. Transparency of the window is possible using the
'compositing' functions of Windows and the code is already there for that
(look for WIN32_COMPOSITING) but is not enabled because 1) it doesn't work
so well 2) it requires a DLL that is only available on Vista and up.

state tracking API - pass NULL to use defaults

reduces typing needed

Nominal support for UVs and Vcols with cached strand data.

These are dummy values currently. The UV and vcol values will be stored
in strands directly, unlike particles which evaluate them every time;
this is a much safer and more efficient approach that makes strand data
truely independent from the "emitter" mesh. Such data will be made
available later, primarily for child curves.

Refactor : Group all split kernel utility functions

Refactor : Remove unused variables

Refactor : Check render feasibility only once

new grid floor drawing function

changes:
- use vec2 instead of vec3 for grid
- single glBegin/End for axis lines
- draw axes regardless of grid-line count
- use depth buffer

tweak GL state tracking

New defaults to match common 3D view usage:
- draw both sides (backface culling off)
- depth buffer test & write enabled

Also made default state more readable.
Fixed copy-paste error, GL_POLYGON_STIPPLE.

Mesh objects now draw fine in wireframe and (smooth) solid modes. Now
compatible with UI widgets drawn later!

Make parallel-samples logic work

Merge branch 'alembic' into gooseberry