Blender Git Loki

Merge branch 'master' into depsgraph_refactor

Conflicts:
CMakeLists.txt
build_files/scons/tools/btools.py
intern/cycles/util/util_types.h
source/blender/editors/object/object_constraint.c

Simplification of the archive init functions in writers and readers.

Now the base types for readers/writers are not nominally forming the
interface any more (they may be removed entirely later). This makes
possible a cleaner init method directly in the Abc Writer/Reader
classes.

Further work may be required in this area.

Merge branch 'master' into wiggly-widgets

after-merge errors fixed

Fix nasty bug preventing any navigation in directories!

Think issue also exists in master code actually, where some op properties
could be left uninitialized in 'params_to_op' helper func... But it does not
backfire like that for sure.

Merge branch 'master' into soc-2014-fluid

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

Conflicts:
source/blender/blenkernel/intern/packedFile.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesrna/intern/rna_scene.c

Amber: only list dirs from real filesystem.

Actual data (assets) are to be 'listed' by another way!

Also, fix mem leak.

Merge branch 'asset-experiments' into asset-engine

Merge branch 'master' into asset-experiments

Moved the dupli cache reading code into a AbcDupligroupReader class.

This is more in line with how readers work in the Blender Alembic
implementation elsewhere.

Generally, readers are less persistent than writers: they are created
whenever cache results need to be updated (e.g. on frame changes) and
discarded afterward. Writers OTOH stay alive during the whole baking
job, since they keep the references to Alembic Writer instances and can
only be deleted once the writing for that part is done.

Store and apply dupli object transforms in the Alembic cache.

Note that the cache stores dupli matrices without the final parent
transform, since it only knows about the group itself. The duplicator
obmat is applied to the duplis after reading the cache.

Handle dupli cache on object copy and freeing.

Updated cache reading function for the new duplilist structure.

Now we store duplilists entirely inside a single alembic object for the
group. This allows using all the generated duplis, which would be
difficult if the alembic file had to define all the possible recursive
dupli relations that Blender allows, beside straightforward Group duplis.

Merge branch 'master' into alembic_pointcache

Start to make Amber a bit more serious!

Still useless - behaves more or less like a very basic, broken filebrowser.

But basics are here, and listing process seems to be working pretty well.

Use a nested Object writer to store the Object ID blocks used by dupli
lists.

Better dupligroup Alembic writer.

Uses the duplilist generated by Blender to define instances, instead of
recreating the group layout. This omits some information about actual
structure of the DNA, which might be useful later on. The main problem
is that the duplilist itself does not encode this, so it's a tradeoff
between either including the Group structure or omitting the other
dupli types, like face, vertex, particle duplis.

Cleanup fcurve tags properly.

Alternative dupli generator function for creating duplis in a group
without a specific parent.