Blender Git Loki

Only show properties if not in camera view, else direct user to camera
properties

Avoid freeing and reading/writing NULL pointers. Should not happen often
but better guard against it.

Support camera GPU parameters when looking/rendering through camera in
the viewport.

Use own file for GPU option types.

* Add gpu options for depth of field to camera - still inactive.
* GPUFXOptions now passed to the compositing system startup
so users can swap options if they wish to

This commit changes read-write data again, people should reset their
values again (sorry for that but this is still WIP)

Support camera GPU parameters when looking/rendering through camera in
the viewport.

Use own file for GPU option types.

* Add gpu options for depth of field to camera - still inactive.
* GPUFXOptions now passed to the compositing system startup
so users can swap options if they wish to

This commit changes read-write data again, people should reset their
values again (sorry for that but this is still WIP)

Merge branch 'terrible_consequencer' into gooseberry

Merge branch 'viewport_experiments' into gooseberry

Conflicts:
source/blender/makesdna/DNA_view3d_types.h

Merge branch 'master' into gooseberry

Offscreen rendering for viewport FX.

This is working mostly from the 3D viewport currently, rendering from
the render buttons or the sequencer will not use the FX yet. Still it's
a solid step towards that direction. Also moved options out of the v3d
struct. Old options will be lost and people may get some warnings,
however simply enableing and disabling one of the compositing settings
will bring the controls back.

fix some errors

Merge branch 'master' into terrible_consequencer

Conflicts:
source/blender/editors/include/UI_view2d.h
source/blender/editors/space_sequencer/sequencer_edit.c

Add another level of small blur to bridge between no/medium blurring.

Algorithm used is now a full implementation of

"Practical Post-Process depth of field", presented here [1],
with a few modifications as to how circle of confusion is
applied at the final pass.

[1] http://http.developer.nvidia.com/GPUGems3/gpugems3_ch28.html

Merge branch 'master' into viewport_experiments

Color Wire: improve method of tinting colors

also improve method to ensure contrast with background

DOF effect works :)

Unused leftover debug variable.

Reimplemented the voxel texture type for displaying hair continuum grids.

Expose hair grid info in the RNA (read-only); it can be useful for
debugging purposes.

Debug visualization code of a slice of the hair velocity vector field.