diff options
Diffstat (limited to 'source/blender/io/alembic')
-rw-r--r-- | source/blender/io/alembic/ABC_alembic.h | 8 | ||||
-rw-r--r-- | source/blender/io/alembic/intern/abc_axis_conversion.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/io/alembic/ABC_alembic.h b/source/blender/io/alembic/ABC_alembic.h index 67f8aeb0a67..28e3d0dd1f5 100644 --- a/source/blender/io/alembic/ABC_alembic.h +++ b/source/blender/io/alembic/ABC_alembic.h @@ -106,13 +106,13 @@ void ABC_get_transform(struct CacheReader *reader, float time, float scale); -/* Either modifies current_mesh in-place or constructs a new mesh. */ +/* Either modifies existing_mesh in-place or constructs a new mesh. */ struct Mesh *ABC_read_mesh(struct CacheReader *reader, struct Object *ob, - struct Mesh *current_mesh, + struct Mesh *existing_mesh, const float time, const char **err_str, - int flags); + int read_flags); bool ABC_mesh_topology_changed(struct CacheReader *reader, struct Object *ob, @@ -134,7 +134,7 @@ bool ABC_has_vec3_array_property_named(struct CacheReader *reader, const char *n int ABC_read_velocity_cache(struct CacheReader *reader, const char *velocity_name, float time, - float fps, + float velocity_scale, int num_vertices, float *r_vertex_velocities); diff --git a/source/blender/io/alembic/intern/abc_axis_conversion.h b/source/blender/io/alembic/intern/abc_axis_conversion.h index 645d9fc783b..797592d9eee 100644 --- a/source/blender/io/alembic/intern/abc_axis_conversion.h +++ b/source/blender/io/alembic/intern/abc_axis_conversion.h @@ -94,7 +94,7 @@ typedef enum { } AbcMatrixMode; void create_transform_matrix(Object *obj, - float r_transform_mat[4][4], + float r_yup_mat[4][4], AbcMatrixMode mode, Object *proxy_from); |