Blender Git Loki

Revert "Decklink test build"

This reverts commit de94cd536de9a6e2b22daa1401e6da7d59c13973.

Decklink test build

Revert "Decklink test build"

This reverts commit 20bcc993e477400a6bac987c9d55da67c11c4646.

Decklink test build

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

Merge remote-tracking branch 'origin/master' into decklink

Just to be sure before using experimental-build

Merge remote-tracking branch 'origin/master' into decklink

Bring in refactor from other (private) branch.

Now the system behaves a bit more like the pointcache.

It's about time I merge the changes.

Merge branch 'master' into openvdb

Conflicts:
source/blender/blenkernel/intern/smoke.c

more manta api refactoring

Generalized algorithm for constructing node blocks based on local arguments.

Nodes can have expression inputs and override argument nodes with local
variables. This means that a local block must be created for each expression
input. The boundaries of such blocks are defined implicitly by upstream nodes
which define their own local arguments (or ultimately by the graph arguments).

The current version is still not quite generic enough to allow arbitrary
nesting of blocks, but it should ensure that expressions don't include all
the parent nodes which don't depend on local arguments and therefore should
be calculated in the parent block (a form of constant folding).

Using the brdf path for default material. And fixing stuff.

Fixing Glass shader color.

Fix backward compatibility.

refactoring manta api and started to comment out old code -> removing it later

Fix & cleanup in outliner area.

Now all new entries in items' menus should behave correctly!

some manta api refactoring

Fix some bad id->flag/tag mismatch from not-so-recent merge with master...

Fix assert when deleting obdata.

Issue here is again with NEVER_NULL usages: obdata (& co) would be dereferenced twice.

I'm not totally happy with this solution, ideally remap should never leave Main
in invalid state, but for now it will do...

Fix a crash when deleting a lib featuring some proxyob source...