diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-04-04 16:07:37 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-01 17:02:27 +0300 |
commit | 89826e0a0d8ac55881569e021c487ac5541c6612 (patch) | |
tree | c80797e8c804d43fc84a8e91396a8a86cf3a79b7 /source/blender/makesrna/intern/rna_constraint.c | |
parent | a72a831570822190f782e6bbecfd57b45dc2e872 (diff) |
Alembic: integrate cache file into the dependency graph
* The cache file datablock is now evaluated as part of the dependency graph,
creating/freeing the Alembic file handle matching the current frame.
Modifiers and constraints depend on this evaluation.
* Cache file handles and readers now only exist on COW datablocks, never the
original ones.
* Object data paths are flushed back to the original for the user interface.
* The cache file keeps a list of all readers associated with its handle, and
automatically frees them when the handle is freed. This kind of sharing of
data across datablocks is weak but we have no better mechanism for it.
Fix T62720: Alembic sequences not working and crashing
Differential Revision: https://developer.blender.org/D4774
Diffstat (limited to 'source/blender/makesrna/intern/rna_constraint.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_constraint.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 44445181402..c1c235d497b 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -729,22 +729,6 @@ static void rna_Constraint_objectSolver_camera_set(PointerRNA *ptr, PointerRNA v } } -static void rna_Constraint_transformCache_object_path_update(Main *bmain, - Scene *scene, - PointerRNA *ptr) -{ -# ifdef WITH_ALEMBIC - bConstraint *con = (bConstraint *)ptr->data; - bTransformCacheConstraint *data = (bTransformCacheConstraint *)con->data; - Object *ob = (Object *)ptr->id.data; - - data->reader = CacheReader_open_alembic_object( - data->cache_file->handle, data->reader, ob, data->object_path); -# endif - - rna_Constraint_update(bmain, scene, ptr); -} - #else static const EnumPropertyItem constraint_distance_items[] = { @@ -2902,7 +2886,7 @@ static void rna_def_constraint_transform_cache(BlenderRNA *brna) prop, "Object Path", "Path to the object in the Alembic archive used to lookup the transform matrix"); - RNA_def_property_update(prop, 0, "rna_Constraint_transformCache_object_path_update"); + RNA_def_property_update(prop, 0, "rna_Constraint_update"); } /* base struct for constraints */ |