Blender Git Loki

convert global track index on blender side

Add menu entries for de/select mesh operators

Fix 'broken lib' status not being updated when library is 'renamed' to existing path.

Merge branch 'master' into id-remap

Merge branch 'master' into soc-2016-multiview

Merge branch 'master' into alembic_basic_io

Add missing CacheFile ID block handling code.

Merge branch 'master' into temp-cycles-microdisplacement

Add back the old hide/reveal functionality as seperate operators.

They can be accessed with Ctrl+H for "deselect 3d mesh" (Shift for unselected) and Ctrl+Alt+H for "select 3D mesh".

ToDo: Decide on final naming together with stakeholder artists

cleanup: removed old manta obj approach - we're using phi grid for liquid inflow

Painstakingly merge branch 'master' into temp_viewport_fx_merge

This branch will not make it into blender, however there are a few things that might be useful here for people who work on the viewport project and could be merged to master:

* Matrix stacks
There is working code for matrix stacks in gpu_matrix.c. Basically it works by overriding all draw calls with a special version that loads our custom stack in OpenGL. To refactor this out, coders should do this in three stages:

1) Inspect all calls to GPUBegin/GPUDraw*/GPURect* and only add one call to upload the matrices once to the relevant uniform of the shader, then substitute with the normal GL call.

2) Remove all hardcoded GL matrices from shaders. Shaders should use generic uniforms/uniform blocks for matrices

3) Do not use GL-style stacks. Actually stacks should be generic and local, not global. We do not care about a global projection/modelview etc matrix, rather we want to add matrix stacks locally in places where they are needed and upload those matrices to our shaders. The code can be generalized to do that by substituting the enum in the gpuMatrix* functions with a GPUMatrixStack* though it will be slightly tedious to do - like everything viewport related.

* GLU removal:

This branch also removes glu completely from blender by providing a helper library that handles drawing of some helper shapes. The way this is handled is not ideal, since it uses the GSOC code that is not the way we want to do things here, however it could be improved and made with a proper design.

There are some graphical glitches still here, but should be fixable.

cleanup old mesh load function in header

Register layer type info as shared layer data

Each layer type is now registered as LayerType instance, working really similar to operator types. This will allow us to create custom layer types from .py, but also makes it easier and more efficient to create layer data that's shared between all layers of a type.

Also removed unneeded layer poll callback.

Merge remote-tracking branch 'origin/master' into soc-2016-uv_tools

Cycles: Add experimental second-order fitting for denoising, disabled for now

This change can help a lot with shadow edges, but adds artifacts to smoother areas.
In the future, I'll look into adaptively selecting the polynomial order.

Cycles: Implement denoising kernels

This commit finally adds the denoising kernels, which means that basic denoising is operational now.

Cycles: Add device code and kernel stubs for denoising

This commit implements stub kernels and the required host-side code to call them (CPU-only for now).

Cycles: Add util header with various matrix/vector math operations for the denoiser

Cycles: Add function to get neighbor tiles for denoising

This is needed by the denoising task to get the buffers of the nearby tiles.
Also, this commit syncs the half window option into the kernel data.

Merge remote-tracking branch 'origin/master' into soc-2016-cycles_images