Blender Git Loki

Cycles Denoising: Fix building without filter debugging

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

Implement separate normal override and single sided collisions

This adds single sided collisions without necessarily using normal
override, and adds a separate normal override option. (code can do with
some cosmetic cleanup)

Also removed a printf I had forgotten.

Fixing Memory Leak

Implemented All Empties type drawing

Merge remote-tracking branch 'origin/master' into gsoc2016-improved_extrusion

Conflicts:
release/datafiles/locale
release/scripts/addons
release/scripts/addons_contrib

Silence more warnings

This should silence the current warnings, and gives us real warnings if
the bContext data is tampered with.

Cycles: Fix rng_state initialization when using resumable rendering

Silence warning

There is still a warning because of `DST.context = C;` which discards
'const' qualifier. I find this a legit problem, I suspect we are not
suppose to store bContext at all.

Implement collision impulse based adaptive step size calculation

Cycles Denoising: Change order of passes in the denoising buffer

Cycles Denoising: Remove useless functions

Cycles Denoising: Fix sample scaling for cross-denoising passes

Cycles Denoising: Allow to ignore cross-denoising passes

Cycles Denoising: Fix multilayer handling when denoising after rendering

Cycles Denoising: Fix Whitespace errors

Cycles Denoising: Implement new cross-denoising mode on CPU

Not very useful yet.

Cycles Denoising: Support postprocess denoising on loaded images

Cycles Denoising: Also enable FPE debugging during denoising

Cycles Denoising: Fix Cross Denoising after Rendering