diff options
| author | Jacques Lucke <jacques@blender.org> | 2022-08-29 18:00:08 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2022-08-29 18:00:08 +0300 |
| commit | e3a6a2f41284f90b01065309dbe2cfb97a292b41 (patch) | |
| tree | 0f310fa0c9d90d9e88a7ddd57429f8276d64ec7d /source/blender/blenkernel/BKE_volume.h | |
| parent | 7bb08882ecec93048bf04d36c7baabd31f341c7a (diff) | |
Fix T99004: scaling volume down results in crash
OpenVDB crashes when the determinant of the grid transformation is
too small. The solution is too detect when the determinant is too small
and to replace the grid with an empty one. If possible the translation
and rotation of the grid remains unchanged.
Differential Revision: https://developer.blender.org/D15806
Diffstat (limited to 'source/blender/blenkernel/BKE_volume.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_volume.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_volume.h b/source/blender/blenkernel/BKE_volume.h index bc578ef8b28..4215cad5858 100644 --- a/source/blender/blenkernel/BKE_volume.h +++ b/source/blender/blenkernel/BKE_volume.h @@ -114,6 +114,7 @@ int BKE_volume_grid_channels(const struct VolumeGrid *grid); * Transformation from index space to object space. */ void BKE_volume_grid_transform_matrix(const struct VolumeGrid *grid, float mat[4][4]); +void BKE_volume_grid_transform_matrix_set(struct VolumeGrid *volume_grid, const float mat[4][4]); /* Volume Editing * @@ -133,6 +134,11 @@ struct VolumeGrid *BKE_volume_grid_add(struct Volume *volume, VolumeGridType type); void BKE_volume_grid_remove(struct Volume *volume, struct VolumeGrid *grid); +/** + * Openvdb crashes when the determinant of the transform matrix becomes too small. + */ +bool BKE_volume_grid_determinant_valid(double determinant); + /* Simplify */ int BKE_volume_simplify_level(const struct Depsgraph *depsgraph); float BKE_volume_simplify_factor(const struct Depsgraph *depsgraph); @@ -186,6 +192,9 @@ openvdb::GridBase::Ptr BKE_volume_grid_openvdb_for_write(const struct Volume *vo struct VolumeGrid *grid, bool clear); +void BKE_volume_grid_clear_tree(Volume &volume, VolumeGrid &volume_grid); +void BKE_volume_grid_clear_tree(openvdb::GridBase &grid); + VolumeGridType BKE_volume_grid_type_openvdb(const openvdb::GridBase &grid); template<typename OpType> |