Blender Git Commits

Revert "Squashed commit of asset-experiments branch."

This reverts commit fb91d6b4a7b784a60d39438111573ea99210f767.

Squashed commit of asset-experiments branch.

Merge branch 'master' into experimental-build

Merge branch 'master' into asset-experiments

Moved the child deformation for strands out of the core cache reading
function.

This is a feature for display in the viewport and rendering, which has
nothing to do with the core cache reading functionality. In the general
case you'd want the child data to remain unmodified.

Was clearing wrong previews

Support metadata display in sequencer overdrop

Getting a consistent look here is difficult since editors apply their
own scaling. ideally, here we would have a consistent look with constant
font size but this is still to be realized in master and needs some
extra thought.

Merge branch 'alembic' into gooseberry

Fix fo 'simple' particle hair matrix calculation.

The parent matrix is used for single-parent children ('simple'), in
which case the pa->num_dmcache has to be used to get the correct
position on subdivided meshes.

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/object/object_shapekey.c

Cycles kernel split: Clarify some comments in session.h

Cycles kernel split: De-duplicate image updating

Was harmless issue caused by merge conflict, but still no reason to
try updating images twice :)

Cycles kernel split: Begin getting rid of device->get_background()

This is actually a bad level access, this thing is to be communicated
via session params.

Also, SVM code to get set of nodes will be reworked, so this function
will likely be removed all together.

Cycles kernel split: Remove global static variable

Things like this actually belongs to the session, no need to keep it
more global that that.

Cycles kernel split: Fix order of headers inclusion

Cycles kernel split: Remove unused and unwanted clos field from ShaderNode

Counting of closures was redone in previous commit so this code is no longer
needed.

Cycles kernel split: Simplify closure counting

The new way does not require having closure type stored in the most generic
ShaderNode class and uses special_type instead to see if it's BSDF node and
get closure from BsdfNode.

Did not see any difference in the behavior with new implementation in file
with all closures added to the same shader tree via mix nodes.

Merge branch 'alembic' into gooseberry

Conflicts:
source/blender/blenkernel/BKE_key.h
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/key.c
source/blender/editors/object/object_shapekey.c
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesrna/intern/rna_key.c

Merge branch 'master' into cycles_kernel_split

Cycles kernel split : Refactor: move atomic_add_float utility function to appropriate place in kernel_split.h