diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2019-07-04 13:04:39 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2019-07-30 17:59:10 +0300 |
| commit | e74847e6bb5cea24def9e544a3fb2bc90150aeaf (patch) | |
| tree | 506fed4a4acff705e465385acdbf36ceae18059a /source/blender/alembic/intern/abc_customdata.h | |
| parent | 3568d56bccc556e04c61d8f6ac3f005b0ff838b7 (diff) | |
Alembic: changed 'void *user_data' to 'Mesh *mesh'
The only thing that is stored in this pointer is a `Mesh*`, and casting
it from/to `void*` is unnecessary and confusing. Maybe the entire
CDStreamConfig class could/should be removed at some point.
No functional changes.
Diffstat (limited to 'source/blender/alembic/intern/abc_customdata.h')
| -rw-r--r-- | source/blender/alembic/intern/abc_customdata.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/alembic/intern/abc_customdata.h b/source/blender/alembic/intern/abc_customdata.h index c36029d5116..0ffafa8848e 100644 --- a/source/blender/alembic/intern/abc_customdata.h +++ b/source/blender/alembic/intern/abc_customdata.h @@ -28,6 +28,7 @@ #include <Alembic/AbcGeom/All.h> struct CustomData; +struct Mesh; struct MLoop; struct MLoopUV; struct MPoly; @@ -60,8 +61,8 @@ struct CDStreamConfig { /* TODO(kevin): might need a better way to handle adding and/or updating * custom datas such that it updates the custom data holder and its pointers * properly. */ - void *user_data; - void *(*add_customdata_cb)(void *user_data, const char *name, int data_type); + Mesh *mesh; + void *(*add_customdata_cb)(Mesh *mesh, const char *name, int data_type); float weight; float time; @@ -75,7 +76,7 @@ struct CDStreamConfig { totpoly(0), totvert(0), pack_uvs(false), - user_data(NULL), + mesh(NULL), add_customdata_cb(NULL), weight(0.0f), time(0.0f), |