Blender Git Loki

Fix Ptex bump coordinates in Cycles

Small Ptex alpha cleanup

Give better name to Ptex packed images

Decrease Ptex packed image refcount

Cleanup leftover code from WIP renderer

Fix error in last commit

Separate widget drawing to update and draw phase to make in-scene widget
drawing possible (need to update once, draw twice).

Merge branch 'master' into asset-experiments

Add very simple UI for setting initial Ptex resolution

More cleanup

Framebuffer effects:

This includes offscreen processing for the 3D viewport and OpenGL rendering.

Included effects are a depth of field shader and a Screen Space Ambient
Occlusion shader.

The system is simplistic and duplicates some code. I am in the process of making abstractions
so the effects can be used in a node system, but we can probably give users
access to the early system right now.

Reviewers: sergey, campbellbarton, jwilkins, merwin

Differential Revision: https://developer.blender.org/D1092

Cleanup - bring branch to merge ready condition

Merge branch 'master' into viewport_experiments

Support dupli transparency pass.

Only for gooseberry for now, since it's slightly hacky and adds extra
cost to duplis.

crash fix: removing the fracture modifier again from object without executing fracture first did crash

Merge branch 'master' into gooseberry

Remove Left/Right commented out code in UI, until we handle this correctly

Image: refactor image_load_sequence_file() function as suggested on review

small cleanup on image.c

Image: refactor image_load_movie_file() function as suggested on review