Blender Git Loki

Cleanup: Use enums where appropriate instead of #defines.

Merge branch 'master' into alembic_pointcache

Conflicts:
CMakeLists.txt
build_files/build_environment/install_deps.sh
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/pointcache.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c
source/blender/render/intern/source/voxeldata.c

Merge branch 'master' into alembic_pointcache

Conflicts:
release/scripts/addons
source/blender/blenkernel/intern/pointcache.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_util.c

Merge branch 'master' into alembic_pointcache

Conflicts:
CMakeLists.txt
source/blender/blenkernel/intern/rigidbody.c
source/blender/makesrna/intern/rna_object_force.c

Only poly and vertex normals are mandatory for a valid normals, loop
normals may not exist.

Note: Currently we cannot create poly normals explicitly from a modifier,
they have to be recalculated every time ...

Basic profiling code for the mesh cache reader function.

Normals storage support in Alembic mesh caches.

This is not strictly necessary, but removes another step in mesh
reconstruction that might take significant time in extreme cases.

All 3 normal attributes (loop, poly, vertex normals) need to be stored
for successful reconstruction, otherwise they have to be recalculated.

Fix for edge properties in Alembic files, was missing edge indices in
MLoops.

Keep track of the error status of readers and writers with a maximum
error level to test for validity.

Store an error handler inside readers and writers.

This is a lot more convenient to use and removes the burden of setting
the desired error handlers from the point cache user. The readers/writers
already know about context (e.g. a modifier) and can define an
appropriate error handler.

Better error handling support for point cache functions.

This defines wrapper macros which catch exceptions from Alembic and
provide ways of reporting these in different ways, depending on the
context.

Merge branch 'master' into alembic_pointcache

Merge branch 'master' into alembic_pointcache

Split mesh reconstruction from Alembic into separate functions like with
the writer.

Nicer code structure for writing Alembic mesh samples, using smaller
functions for individual data properties.

Store edge topology explicitly in Alembic files as a user property.

This is not a native part of the core Alembic mesh schema, but can be
defined simply as a custom property.

Two advantages:
* Loose edges without faces are stored in the Alembic files and restored
on loading
* Building edges on the fly after loading topology from the cache was
the biggest bottleneck for cache performance.

Keep a permanent cache reader instance in the point cache modifier and
handle explicit mode switching between reading/writing.

Removed unused frame value code.

Added a custom mesh attribute for polygon "smooth" flags on meshes.

Additional sanity checks needed in the cache reader because accessing
non-existent child objects when reading Alembic can cause crash.

This should be generalized somewhat later to ensure consistency between
different reader models.