Blender Git Loki

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/space_clip/clip_draw.c
source/blender/gpu/GPU_buffers.h

Merge branch 'master' into UI-graphical-redesign

Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/editors/interface/resources.c

Merge branch 'master' into UI-experiments

Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/editors/interface/resources.c

Cleanup: reorder operations in the loop over the vdb tree nodes.

Visualization: compute normals for voxel box drawing.

Visualization: draw full boxes for voxels.

Also avoid creating several instances of the same vertex.

Use index buffers for drawing with vertex buffers.

Tests show that we gain approximately 20-25% performance
by that for solid mode drawing.

Good memory/performance is gained for quad meshes mostly
but we also gain performance in triangle meshes as well.

This commit will not get rid of the CPU overhead in
some modes (textured/GLSL) yet, but it prepares the
code for caching changes to make things better
.

Exporter: option to write grids as 16-bit half floats.

This is just for storing on disk, the grids are converted back to full
float format upon reading. Also this affects all grids to be written for
now.

Port Subsurf to VBO code from GPUDataRequest branch.

This adds support for vertex buffers for solid shaded mode for subsurf
modifiers, making drawing of subsurf much faster in this mode.

It also moves towards the goal of data driven requests for our new
renderer system, but this will need further changes down the line.

Everything should work as before with the exception of simplified
multires drawing in sculpting (feature enabled while rotating the view).

Cycles: Respect duplicator's object motion blur settings

The idea is to make it possible to control linked duplicated objects motion
blur from the scene file without need to do overrides on the linked object
settings. Currently only supported for dupligroup duplication and all now
if duplicator object has motion blur disabled then it'll be inherited into
all the duplicated objects.

There should be no regressions/changes in look of existing files because
objects do have motion blur enabled by default.

Cycles: Respect duplicator's object motion blur settings

The idea is to make it possible to control linked duplicated objects motion
blur from the scene file without need to do overrides on the linked object
settings. Currently only supported for dupligroup duplication and all now
if duplicator object has motion blur disabled then it'll be inherited into
all the duplicated objects.

There should be no regressions/changes in look of existing files because
objects do have motion blur enabled by default.

WGL: fix minor error in previous patch.

WGL: give precedence to AA over Swap copy.

Certain GPU (intel) will not allow MSAA together with swap copy.
Previously, swap copy had priority over MSAA: fewer AA samples would be
chosen if it was the condition to get swap copy. This patch reverse the
logic: swap copy will be abandonned if another swap method (undefined or
exchange) will provide the number of AA samples requested. If no AA
samples is requested, swap copy still has the priority of course.

Merge branch 'master' into GPencil_Editing_Stage3

Gooseberry: Fix compilation error with Alembic disabled

Blender 2.75: Fix compilation error caused by the addons fix

It was relying on a new function introduced by in 958c208.

Filebrowser internal listing & UUIDs: simpler & safer UUIDs generation.

Instead of computing MD5sum of paths, just use incremental UUIDs!
There meaning and lifetime for internal listing is very limited anyway,
they shall only be unique for a given listing.

Note about using atomic op here: did it because it's nice use case,
not sure it's worth adding atomic stuff to /editors area though?

Blender 2.75: Point addons submodules to latest backported revision

Fix T45104: RGBA PNG Stereo 3d Anaglyph renders turn all shades of black into alpha in 2.75 RC1

Remove copying of preview data for objects and groups datablocks.

Those get temporarily duplicated by renderers (Cycles, Freestyle),
not nice to have useless memory usage here.