Blender Git Loki

Cleanup: mostly removes useless diff from master.

Merge branch 'id-remap' into asset-experiments

Conflicts:
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/intern/wm_operators.c

Merge branch 'asset-engine' into asset-experiments

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-engine

Merge branch 'master' into id-remap

Use the bvm function cache for modifier nodes, to avoid recompiling all the time.

Separation of dependencies of node trees and their users for compiling vs. evaluation.

So far any change in a node tree would cause both a recompile of bvm functions
as well as a re-evaluation of any users of that function. This is quite inefficient
and should be separated to allow caching of the bvm functions independent from
their users.

To this end the nodes now have 2 callbacks: one for getting compile deps, the other
for getting eval deps.
* Compile dependencies are typically other node trees (node groups). In the future
this could also be Text datablocks, similar to how OSL script nodes work.
* Eval dependencies are all the blend_data blocks that a function might access.
For modifier nodes these could typically be meshes, curves; for shaders could
be images, textures; and so forth.

Separating these dependencies means the bvm functions will have to be recompiled
only when the actual bNodes change (add/remove, linking, socket values).
Conversely when some modifier input data changes (editing, cfra) the modifier
function will be re-evaluated.

Use C callbacks for implementation of DepsNodeHandle.

This makes it possible to create generic dependency functions to
handle dependencies in various ways, using the same reporting callback.
Currently used for depsgraph building in 2 passes (nodes & relations).

buoyancy improvements

Revert "Cycles-Bake: Custom Baking pass"

This reverts commit 52254ce655597c430ced176272f5202fedad2c02.

Cycles-Bake: Custom Baking pass

This pass is built based on the passes the user finds fit.

It is useful for lightmap baking, as well as non-view dependent effects
baking.

Merge remote-tracking branch 'origin/master' into experimental-build

Removed default case for the opcode switch, all opcodes should be handled explicitly.

Merge branch 'master' into asset-engine

Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/intern/text.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_tools.c

Merge branch 'master' into object_nodes

Explicit depsgraph tagging for object nodetree is not necessary any more.

Extension of depsgraph API to handle the relations between node trees.

This allows node groups and similar nodes with a node tree ID pointer
to register in the depsgraph.

In addition to defining relations, the builder must also make sure
that the node tree depsnodes are created first, because, unlike objects,
node trees depsnodes have no direct scene connection and are not generated
in advance. Since the build process has two distinct steps for creating
nodes and relations, the same API is used for both to simplify the code.

Generalization of function caching to avoid unnecessary recompilation.

The function cache allows callers to store functions in a cache (hash table).
The functions also have a reference count, so replacing the function
in the cache (when the node tree changes) does not immediately delete
the current instance. This allows background threads to keep using the
old function until they can cleanly return (tasks should be restarted
when the nodes become outdated, but this is up to the caller system).