Blender Git Loki

OpenGL immediate mode: editmesh_knife.c

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

Part of T49043

UI: Add missing colon

OpenGL immediate mode: transform_constraints.c

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

Part of T49043

OpenGL immediate mode: transform_generics.c

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

Part of T49043

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

Fix T50570: pressing pgup or pgdn in any scrollable area irreversably alters scrolling speed.

'page' prop of scroll up/down operators would get stuck once set once by
pageup/down keys... Now only take this prop into account if explicitely
set, not when its value is inherited from previous run.

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.

Cycles tests: Allow python auto-exec

Implement collision impulse based adaptive step size calculation

Cycles: Fix rng_state initialization when using resumable rendering

Cycles Denoising: Change order of passes in the denoising buffer

Cycles Denoising: Remove useless functions

Cycles Denoising: Fix sample scaling for cross-denoising passes