Blender Git Loki

DNA: rename Collection.dupli_ofs -> instance_collection

DNA: support renaming structs that use the old renaming hack

RNA: use clog for logging error messages

Some RNA errors are quite similar, use clog for consistent logging that
always includes the file, function and line number - making errors
quicker to troubleshoot.

Cleanup: style

Correct own mistake in near/far cleanup

Error in 2f737c4f475a5

doxygen: add newline after file

While file doesn't need an argument, it can't have another doxy
command after it.

Cleanup: conform headers to have license first

Also remove doxy comments for licenses and add missing GPL header.

DNA: comment on how to avoid DNA rename errors

Merge branch 'functions-in-train' into functions

Merge branch 'master' into functions

initial type relations and improved inferencer

Units: allow short unit names be case sensitive when needed.

To distinguish mW and MW without having to deviate from the standard
SI unit abbreviation. For all other units there are no changes.

Units: add support for light power units in Watt. Use for Eevee lights.

This affects point, spot and area lights. Sun light strength remains without
a unit. This change does not affect .blend file compatibility in any way, as
with the rest of the unit system it's purely a display and editing feature.

Not used for Cycles yet, that will be done after unifying the settings with
Eevee.

Cleanup: remove leftover hemi light code.

Merge branch 'blender2.7'

initial type inferencer

small vector - remove and reorder

Fix T54504: Cycles wrong backwards compatibility with linked libraries.

The code assumed all datablocks were read from .blend files saved with the
same version. This restructures the Cycles versioning code to take into
account libraries.

initial lazy init macro

MemPool